Hello community, here is the log from the commit of package patterns-openSUSE checked in at Wed Jun 4 13:08:52 CEST 2008. -------- --- patterns-openSUSE/patterns-openSUSE.changes 2008-05-28 11:32:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/patterns-openSUSE.changes 2008-06-04 12:01:22.000000000 +0200 @@ -1,0 +2,20 @@ +Wed Jun 4 12:01:13 CEST 2008 - coolo@suse.de + +- put alsa firmware on live cd (bnc#396109) + +------------------------------------------------------------------- +Wed Jun 4 10:21:00 CEST 2008 - coolo@suse.de + +- make promo dvd an own pattern package + +------------------------------------------------------------------- +Wed Jun 4 09:36:32 CEST 2008 - coolo@suse.de + +- don't require thinkreader support + +------------------------------------------------------------------- +Tue Jun 3 16:53:22 CEST 2008 - coolo@suse.de + +- do not put update-test on DVD + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ patterns-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.c24406/_old 2008-06-04 13:08:42.000000000 +0200 +++ /var/tmp/diff_new_pack.c24406/_new 2008-06-04 13:08:42.000000000 +0200 @@ -17,7 +17,7 @@ AutoReqProv: on Summary: Patterns for Installation (full ftp tree) Version: 11.0 -Release: 104 +Release: 107 Url: http://en.opensuse.org/Patterns BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: patterns-openSUSE-data.tar.bz2 @@ -64,7 +64,7 @@ License: GPL v2 or later Summary: Patterns for Installation (KDE CD) Group: Metapackages -Conflicts: patterns-openSUSE-dvd5 patterns-openSUSE-dvd9 patterns-openSUSE-cd patterns-openSUSE-addon-non-oss patterns-openSUSE patterns-openSUSE-KDE-cd +Conflicts: patterns-openSUSE-dvd5 patterns-openSUSE-dvd9 patterns-openSUSE-cd patterns-openSUSE-addon-non-oss patterns-openSUSE patterns-openSUSE-GNOME-cd %description KDE-cd This is an internal package that is used to create the patterns as part @@ -73,6 +73,19 @@ +%package Promo +License: GPL v2 or later +Summary: Patterns for Installation (full ftp tree) +Group: Metapackages +Conflicts: patterns-openSUSE-dvd5 patterns-openSUSE-dvd9 patterns-openSUSE-cd patterns-openSUSE-addon-non-oss patterns-openSUSE patterns-openSUSE-KDE-cd patterns-openSUSE-GNOME-cd + +%description Promo +This is an internal package that is used to create the patterns as part +of the installation source setup. Installation of this package does +not make sense. + + + %prep %setup -q -n patterns-openSUSE-data @@ -109,6 +122,15 @@ /CD1/suse/setup/descr/dvd-*.pat /CD1/suse/setup/descr/non_oss-*.pat +%files Promo +%defattr(-,root,root) +%dir /CD1 +%dir /CD1/suse +%dir /CD1/suse/setup +%dir /CD1/suse/setup/descr +/CD1/suse/setup/descr/promo_dvd-*.pat +/CD1/suse/setup/descr/non_oss-*.pat + %files GNOME-cd %defattr(-,root,root) %dir /CD1 @@ -134,6 +156,14 @@ /CD1/suse/setup/descr/non_oss-*.pat %changelog +* Wed Jun 04 2008 coolo@suse.de +- put alsa firmware on live cd (bnc#396109) +* Wed Jun 04 2008 coolo@suse.de +- make promo dvd an own pattern package +* Wed Jun 04 2008 coolo@suse.de +- don't require thinkreader support +* Tue Jun 03 2008 coolo@suse.de +- do not put update-test on DVD * Wed May 28 2008 coolo@suse.de - dropped kst for wallpapers * Tue May 27 2008 coolo@suse.de ++++++ patterns-openSUSE-data.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/REST-CD new/patterns-openSUSE-data/data/REST-CD --- old/patterns-openSUSE-data/data/REST-CD 2008-05-27 11:33:28.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-CD 2008-06-04 12:01:03.000000000 +0200 @@ -115,7 +115,7 @@ // required by yast2-dsl (#377472) smpppd -// bnc#391434 -vmware-kmp-default -vmware-kmp-pae +// #396109 +alsa-firmware +awesfx -Prc: 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-05-27 11:33:28.000000000 +0200 +++ new/patterns-openSUSE-data/data/REST-DVD 2008-05-28 22:03:58.000000000 +0200 @@ -150,4 +150,7 @@ // #391434 open-vm-tools +vmware-kmp-default +vmware-kmp-pae + -Prc: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/data/YAST_BASIS new/patterns-openSUSE-data/data/YAST_BASIS --- old/patterns-openSUSE-data/data/YAST_BASIS 2008-05-27 11:33:28.000000000 +0200 +++ new/patterns-openSUSE-data/data/YAST_BASIS 2008-06-02 13:44:57.000000000 +0200 @@ -1,6 +1,4 @@ +Prq: -// #304686 -yast2-fingerprint-reader limal-perl yast2 yast2-country @@ -120,4 +118,5 @@ #endif // yast2-network smartlink-softmodem +yast2-fingerprint-reader -Psg: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_dvd/recommends new/patterns-openSUSE-data/toinstall/rest_dvd/recommends --- old/patterns-openSUSE-data/toinstall/rest_dvd/recommends 2008-05-07 14:18:57.000000000 +0200 +++ new/patterns-openSUSE-data/toinstall/rest_dvd/recommends 2008-06-04 11:05:13.000000000 +0200 @@ -1,4 +1,7 @@ +32bit +64bit apparmor +apparmor_opt base console default @@ -23,34 +26,34 @@ dhcp_dns_server directory_server enhanced_base +enhanced_base_opt file_server fonts +fonts_opt games +games_opt gateway_server gnome +gnome_admin gnome_basis +gnome_basis_opt +gnome_games +gnome_ide +gnome_imaging +gnome_imaging_opt +gnome_internet +gnome_laptop +gnome_multimedia +gnome_multimedia_opt +gnome_office +gnome_office_opt +gnome_utilities +gnome_utilities_opt +gnome_xgl +gnome_yast imaging +imaging_opt kde -kde4_basis -kde3_basis -lamp_server -laptop -mail_server -misc_server -multimedia -network_admin -office -print_server -remote_desktop -sw_management -voip -x11 -xen_server -xfce -xgl -yast2_basis -yast2_install_wf -technical_writing kde3 kde3_admin kde3_basis @@ -87,7 +90,33 @@ kde4_utilities_opt kde4_xgl kde4_yast -update_test -32bit -64bit +lamp_server +laptop +mail_server +manuals +misc_server +multimedia +multimedia_opt +network_admin +non_oss +non_oss_java +office +office_opt +print_server +remote_desktop +sw_management +sw_management_gnome +sw_management_kde3 +sw_management_kde4 +technical_writing +voip +x11 +x11_opt +x11_yast x86 +xen_server +xfce +xgl +yast2_basis +yast2_install_wf +enhanced_base_opt diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_promo_dvd/category new/patterns-openSUSE-data/toinstall/rest_promo_dvd/category --- old/patterns-openSUSE-data/toinstall/rest_promo_dvd/category 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_promo_dvd/category 2008-06-04 10:05:59.000000000 +0200 @@ -0,0 +1 @@ +addon diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_promo_dvd/icon new/patterns-openSUSE-data/toinstall/rest_promo_dvd/icon --- old/patterns-openSUSE-data/toinstall/rest_promo_dvd/icon 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_promo_dvd/icon 2008-06-04 10:05:59.000000000 +0200 @@ -0,0 +1 @@ +pattern-generic diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_promo_dvd/order new/patterns-openSUSE-data/toinstall/rest_promo_dvd/order --- old/patterns-openSUSE-data/toinstall/rest_promo_dvd/order 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_promo_dvd/order 2008-06-04 10:05:59.000000000 +0200 @@ -0,0 +1 @@ +1980 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_promo_dvd/recommends new/patterns-openSUSE-data/toinstall/rest_promo_dvd/recommends --- old/patterns-openSUSE-data/toinstall/rest_promo_dvd/recommends 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_promo_dvd/recommends 2008-06-04 10:52:07.000000000 +0200 @@ -0,0 +1,82 @@ +apparmor +base +console +default +devel_basis +devel_C_C++ +devel_kernel +dhcp_dns_server +directory_server +enhanced_base +file_server +fonts +games +gateway_server +gnome +gnome_admin +gnome_basis +gnome_games +gnome_ide +gnome_imaging +gnome_internet +gnome_laptop +gnome_multimedia +gnome_office +gnome_utilities +gnome_xgl +gnome_yast +imaging +kde +kde3 +kde3_admin +kde3_basis +kde3_edutainment +kde3_games +kde3_ide +kde3_imaging +kde3_internet +kde3_laptop +kde3_multimedia +kde3_office +kde3_utilities +kde3_xgl +kde3_yast +kde4 +kde4_admin +kde4_basis +kde4_edutainment +kde4_games +kde4_ide +kde4_imaging +kde4_internet +kde4_laptop +kde4_multimedia +kde4_office +kde4_utilities +kde4_xgl +kde4_yast +lamp_server +laptop +mail_server +manuals +misc_server +multimedia +network_admin +non_oss +non_oss_java +office +print_server +remote_desktop +sw_management +sw_management_gnome +sw_management_kde3 +sw_management_kde4 +voip +x11 +x11_yast +x86 +xen_server +xfce +xgl +yast2_basis +yast2_install_wf diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_promo_dvd/role new/patterns-openSUSE-data/toinstall/rest_promo_dvd/role --- old/patterns-openSUSE-data/toinstall/rest_promo_dvd/role 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_promo_dvd/role 2008-06-04 10:05:59.000000000 +0200 @@ -0,0 +1 @@ +Desktop Functions diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_promo_dvd/sel new/patterns-openSUSE-data/toinstall/rest_promo_dvd/sel --- old/patterns-openSUSE-data/toinstall/rest_promo_dvd/sel 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_promo_dvd/sel 2008-06-04 10:06:11.000000000 +0200 @@ -0,0 +1,3 @@ +REST-DVD +REST-CD +REST-DVD-RPMLIST diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/patterns-openSUSE-data/toinstall/rest_promo_dvd/visible new/patterns-openSUSE-data/toinstall/rest_promo_dvd/visible --- old/patterns-openSUSE-data/toinstall/rest_promo_dvd/visible 1970-01-01 01:00:00.000000000 +0100 +++ new/patterns-openSUSE-data/toinstall/rest_promo_dvd/visible 2008-06-04 10:05:59.000000000 +0200 @@ -0,0 +1 @@ +false ++++++ sort_opensuse_patterns ++++++ --- patterns-openSUSE/sort_opensuse_patterns 2008-05-28 11:35:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/patterns-openSUSE/sort_opensuse_patterns 2008-06-04 12:39:35.000000000 +0200 @@ -41,7 +41,7 @@ set +x descrdir=$RPM_BUILD_ROOT/CD1/suse/setup/descr -#rm $descrdir/update_test*.pat +rm $descrdir/update_test*.pat # Handle architecture dependend patterns @@ -65,6 +65,8 @@ mkdir sortin cat $descrdir/rest_cd_kde4* > sortin/kde4-cd +cat $descrdir/rest_promo_dvd* > sortin/promo-dvd +rm $descrdir/rest_promo_dvd* cat $descrdir/rest_cd_kde3* > sortin/kde3-cd cat $descrdir/rest_cd_gnome* > sortin/gnome-cd cat $descrdir/non_oss*.pat > sortin/non-oss @@ -82,6 +84,9 @@ if grep -x $nicename toinstall/rest_cd_gnome/requires; then cat $descrdir/$pat >> sortin/gnome-cd fi + if grep -x $nicename toinstall/rest_promo_dvd/recommends; then + cat $descrdir/$pat >> sortin/promo-dvd + fi cat $descrdir/$pat >> sortin/dvd rm $descrdir/$pat done @@ -90,5 +95,6 @@ mv sortin/gnome-cd $descrdir/gnome_cd-$version-$release.$uname.pat mv sortin/dvd $descrdir/dvd-$version-$release.$uname.pat mv sortin/non-oss $descrdir/non_oss-$version-$release.$uname.pat +mv sortin/promo-dvd $descrdir/promo_dvd-$version-$release.$uname.pat rmdir sortin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org