Hello community, here is the log from the commit of package patterns-openSUSE checked in at Fri Mar 21 04:18:53 CET 2008. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2008-03-18 14:45:24.000000000 +0100 +++ patterns-openSUSE/patterns-openSUSE.changes 2008-03-20 08:35:56.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Mar 20 08:35:21 CET 2008 - coolo@suse.de + +- rework package, so I can build patterns out of SVN + +------------------------------------------------------------------- +Thu Mar 20 08:03:58 CET 2008 - coolo@suse.de + +- adding PolicyKit-gnome to the GNMOE desktop (bnc#372514) + +------------------------------------------------------------------- +Wed Mar 19 15:55:39 CET 2008 - coolo@suse.de + +- include libcompizconfig in pattern that installs compiz + (bnc #371550) + +------------------------------------------------------------------- Old: ---- list-requires New: ---- sort_opensuse_patterns ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.uE2680/_old 2008-03-21 04:15:29.000000000 +0100 +++ /var/tmp/diff_new_pack.uE2680/_new 2008-03-21 04:15:29.000000000 +0100 @@ -18,15 +18,13 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.0 -Release: 58 +Release: 60 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 Source1: preprocess -Source2: list-requires Source3: %name-rpmlintrc Source4: create-suggests -%define __find_requires perl %{S:2} -%define _use_internal_dependency_generator 0 +Source5: sort_opensuse_patterns Conflicts: patterns-openSUSE-dvd5 patterns-openSUSE-dvd9 patterns-openSUSE-cd patterns-openSUSE-addon-non-oss patterns-openSUSE-GNOME-cd patterns-openSUSE-KDE-cd %description @@ -78,72 +76,24 @@ %build for i in data/*; do sh %SOURCE1 $i; done | perl %SOURCE4 | \ uniq > data/REST-DVD-SUGGESTS +for i in gnome kde; do + sh %{SOURCE1} toinstall/rest_cd_$i/requires > t && \ + mv t toinstall/rest_cd_$i/requires +done /usr/sbin/patterns_utf8 %install . /.buildenv export BUILD_BASENAME # Create description files for YaST2: -rm -Rf $RPM_BUILD_ROOT -mkdir $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/CD1/suse/setup/descr # # Patterns # # For generation of -32bit/-x86/-64bit patterns -%ifarch x86_64 ia64 s390x ppc -%ifarch x86_64 s390x -pat_ext="32bit" -%endif -%ifarch ia64 -pat_ext="x86" -%endif -%ifarch ppc -pat_ext="64bit" -%endif -%else -pat_ext="" -%endif -/usr/sbin/create_pattern.sh %{version} %{release} %{_target_cpu} $RPM_BUILD_ROOT $pat_ext -set +x -descrdir=$RPM_BUILD_ROOT/CD1/suse/setup/descr -#rm $descrdir/update_test*.pat -# Handle architecture dependend patterns -%ifnarch %ix86 x86_64 -rm -v $descrdir/xen_server*.pat -rm -v $descrdir/non_oss_java*.pat -%endif -%ifnarch ia64 -rm -v $descrdir/x86*.pat -%endif -%ifnarch s390 ppc -rm -v $descrdir/64bit*.pat -%endif -%ifnarch s390x x86_64 -rm -v $descrdir/32bit*.pat -%endif -mkdir sortin -cat $descrdir/rest_cd_kde* > sortin/kde-cd -cat $descrdir/rest_cd_gnome* > sortin/gnome-cd -cat $descrdir/non_oss*.pat > sortin/non-oss -rm $descrdir/non_oss*.pat -echo > sortin/dvd -for pat in $descrdir/*.pat; do - pat=`basename $pat` - nicename=`echo $pat | sed -e "s,-%{version}.*,,"` - if sh %{SOURCE1} toinstall/rest_cd_kde/requires | grep -x $nicename; then - cat $descrdir/$pat >> sortin/kde-cd - fi - if sh %{SOURCE1} toinstall/rest_cd_gnome/requires | grep -x $nicename; then - cat $descrdir/$pat >> sortin/gnome-cd - fi - cat $descrdir/$pat >> sortin/dvd - rm $descrdir/$pat -done -mv sortin/kde-cd $descrdir/kde_cd-%{version}-%{release}.%{_target_cpu}.pat -mv sortin/gnome-cd $descrdir/gnome_cd-%{version}-%{release}.%{_target_cpu}.pat -mv sortin/dvd $descrdir/dvd-%{version}-%{release}.%{_target_cpu}.pat -mv sortin/non-oss $descrdir/non_oss-%{version}-%{release}.%{_target_cpu}.pat +rm -rf $RPM_BUILD_ROOT +export RPM_BUILD_ROOT +export RPM_SOURCE_DIR +sh %{SOURCE5} %{version} %{release} %{_target_cpu} %files %defattr(-,root,root) @@ -179,6 +129,13 @@ /CD1/suse/setup/descr/non_oss-*.pat %changelog +* Thu Mar 20 2008 coolo@suse.de +- rework package, so I can build patterns out of SVN +* Thu Mar 20 2008 coolo@suse.de +- adding PolicyKit-gnome to the GNMOE desktop (bnc#372514) +* Wed Mar 19 2008 coolo@suse.de +- include libcompizconfig in pattern that installs compiz + (bnc #371550) * Tue Mar 18 2008 coolo@suse.de - remove dropped packages, flag i586 only packages * Tue Mar 18 2008 coolo@suse.de ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/BASIS new/patterns-openSUSE-data/data/BASIS --- old/patterns-openSUSE-data/data/BASIS 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/BASIS 2008-03-18 20:43:58.000000000 +0100 @@ -26,7 +26,7 @@ #if defined(__i386__) || defined (__x86_64__) grub #endif -#ifdef __powerpc__ +#ifdef __ppc__ lilo #endif -Prq: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-BASIS new/patterns-openSUSE-data/data/DEVEL-BASIS --- old/patterns-openSUSE-data/data/DEVEL-BASIS 2008-03-07 11:50:44.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-BASIS 2008-03-18 20:43:51.000000000 +0100 @@ -33,7 +33,7 @@ pam-devel pkg-config subversion -#ifdef __powerpc__ +#ifdef __ppc__ itrace #endif // most of our packages use this tool diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/DEVEL-Cell new/patterns-openSUSE-data/data/DEVEL-Cell --- old/patterns-openSUSE-data/data/DEVEL-Cell 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/DEVEL-Cell 2008-03-18 20:44:06.000000000 +0100 @@ -2,7 +2,7 @@ cross-spu-newlib cross-spu-gcc cross-spu-binutils -#ifdef __powerpc__ +#ifdef __ppc__ libspe #endif -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS new/patterns-openSUSE-data/data/ENHANCED-BASIS --- old/patterns-openSUSE-data/data/ENHANCED-BASIS 2008-03-07 11:51:12.000000000 +0100 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS 2008-03-18 20:43:25.000000000 +0100 @@ -130,7 +130,7 @@ yp-tools ypbind lilo -#ifdef __powerpc__ +#ifdef __ppc__ pdisk powerpc32 // #303737 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT --- old/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2008-03-16 10:55:25.000000000 +0100 +++ new/patterns-openSUSE-data/data/ENHANCED-BASIS-OPT 2008-03-18 20:43:38.000000000 +0100 @@ -16,7 +16,7 @@ gutenprint hplip initviocons -#ifdef __powerpc__ +#ifdef __ppc__ hfsutils #endif joe @@ -67,7 +67,7 @@ ash cpufrequtils delayacct-utils -#ifndef __powerpc__ +#ifndef __ppc__ hfsutils #endif jfsutils diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/GNOME-BASIS new/patterns-openSUSE-data/data/GNOME-BASIS --- old/patterns-openSUSE-data/data/GNOME-BASIS 2008-03-14 11:34:18.000000000 +0100 +++ new/patterns-openSUSE-data/data/GNOME-BASIS 2008-03-20 08:03:52.000000000 +0100 @@ -8,6 +8,8 @@ gnome-vfs2 // SUSE gnome greeter (#302026) ggreeter +// #372514 +PolicyKit-gnome -Prq: +Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/KDE4-BASIS new/patterns-openSUSE-data/data/KDE4-BASIS --- old/patterns-openSUSE-data/data/KDE4-BASIS 2008-03-18 13:52:16.000000000 +0100 +++ new/patterns-openSUSE-data/data/KDE4-BASIS 2008-03-19 11:55:09.000000000 +0100 @@ -24,7 +24,7 @@ gdb kde4-kdm -Prc: -+Psc: ++Psg: kpowersave --Psc: +-Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-DVD new/patterns-openSUSE-data/data/REST-DVD --- old/patterns-openSUSE-data/data/REST-DVD 2008-03-18 14:30:32.000000000 +0100 +++ new/patterns-openSUSE-data/data/REST-DVD 2008-03-18 18:08:21.000000000 +0100 @@ -142,7 +142,7 @@ wlan-ng-kmp-xen quickcam-kmp-default -#if defined(__i586__) +#if defined(__i386__) kqemu-kmp-pae aufs-kmp-pae virtualbox-ose-kmp-pae diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/X11-OPT new/patterns-openSUSE-data/data/X11-OPT --- old/patterns-openSUSE-data/data/X11-OPT 2008-02-19 11:33:22.000000000 +0100 +++ new/patterns-openSUSE-data/data/X11-OPT 2008-03-18 18:08:40.000000000 +0100 @@ -7,7 +7,7 @@ x11-input-wacom xlockmore xtermset -#if !defined(i386) +#if !defined(__i386__) nspluginwrapper #endif -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/XGL new/patterns-openSUSE-data/data/XGL --- old/patterns-openSUSE-data/data/XGL 2008-01-30 21:49:37.000000000 +0100 +++ new/patterns-openSUSE-data/data/XGL 2008-03-19 15:54:37.000000000 +0100 @@ -1,4 +1,10 @@ +Prq: compiz xgl +compizconfig-settings-manager +compiz-fusion-plugins-main +libcompizconfig +python-compizconfig +compiz-manager +simple-ccsm -Prq: ++++++ patterns-openSUSE-rpmlintrc ++++++ --- patterns-openSUSE/patterns-openSUSE-rpmlintrc 2008-03-18 14:55:07.000000000 +0100 +++ patterns-openSUSE/patterns-openSUSE-rpmlintrc 2008-03-20 08:36:14.000000000 +0100 @@ -1,4 +1,6 @@ addFilter("W: no-binary"); addFilter("W: explicit-lib-dependency"); addFilter("W: devel-dependency"); +# the script does that +addFilter("W: %install-no-mkdir-buildroot"); ++++++ preprocess ++++++ --- patterns-openSUSE/preprocess 2008-03-18 14:55:07.000000000 +0100 +++ patterns-openSUSE/preprocess 2008-03-20 08:36:14.000000000 +0100 @@ -1,4 +1,9 @@ #!/bin/bash -{ /usr/bin/cpp -Ulinux -Uunix -P $1; echo; } | grep -v "^$" +cmdline= +if test -n "$EXPLICIT_UNAME"; then + cmdline="-U__i386__ -Ui386 -Ux86_64 -U__i586__ -U__x86_64__ -U__i686__ -D__$EXPLICIT_UNAME""__ -D$EXPLICIT_UNAME" +fi + +{ /usr/bin/cpp -Ulinux -Uunix $cmdline -P $1; echo; } | grep -v "^$" exit 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org