Hello community, here is the log from the commit of package skelcd-openSUSE checked in at Mon Nov 17 23:45:15 CET 2008. -------- --- skelcd-openSUSE/skelcd-openSUSE.changes 2008-11-10 16:26:33.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-openSUSE/skelcd-openSUSE.changes 2008-11-12 21:19:54.303399000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 12 21:19:45 CET 2008 - coolo@suse.de + +- no more beta eula - only a popup + +------------------------------------------------------------------- skelcd-openSUSE-non-OSS.changes: same change calling whatdependson for head-i586 Old: ---- license-Beta.txt ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE-non-OSS.spec ++++++ --- /var/tmp/diff_new_pack.kO1383/_old 2008-11-17 23:44:52.000000000 +0100 +++ /var/tmp/diff_new_pack.kO1383/_new 2008-11-17 23:44:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE-non-OSS (Version 2008.11.10) +# spec file for package skelcd-openSUSE-non-OSS (Version 2008.11.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,19 +27,16 @@ Group: Metapackages Conflicts: skelcd-SUSE_Linux skelcd-SUSE_Linux-AddOn skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD AutoReqProv: off -Version: 2008.11.10 -Release: 2 +Version: 2008.11.17 +Release: 1 Summary: Skeleton for openSUSE non-OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: skelcd.tar.bz2 Source2: README Source4: license-nonoss.tar.bz2 Source5: license-SL.tar.bz2 -Source6: license-Beta.txt Source7: skelcd-openSUSE-rpmlintrc Source10: README.docudir -# show beta EULA - or final one? -%define beta_eula 1 # changed by pre_checkin %define is_non_oss 1 # define our version @@ -119,14 +116,11 @@ recode utf8..mac $RPM_BUILD_ROOT/CD1/$i.mac.txt %endif done -%if !%{beta_eula} -rm $RPM_BUILD_ROOT/CD1/README.BETA* -%endif # # Copy the right README.BETA or LICENSE.TXT file # # Add infos to license files -for i in license-SL/license* %{SOURCE6}; do +for i in license-SL/license*; do sed -e "s@#DATE#@$DATE_ENG@" \ -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $i \ > $i.new @@ -135,13 +129,8 @@ # EULA.txt contains the Novell EULA, other EULAs and a list # of FOSS licenses. The first part is added here, the rest # is autobuild work -%if %{beta_eula} -cp %{SOURCE6} $RPM_BUILD_ROOT/CD1/EULA.txt -(cp %{SOURCE6} license.txt;tar cvzf license.tar.gz *txt;cp license.tar.gz $RPM_BUILD_ROOT/CD1/) -%else cp license-SL/license.txt $RPM_BUILD_ROOT/CD1/EULA.txt (cd license-SL;tar cvzf license.tar.gz *txt;cp license.tar.gz $RPM_BUILD_ROOT/CD1/) -%endif # docudir stuff # # SuSE manuals @@ -165,6 +154,8 @@ # cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.html cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.rtf $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.rtf +#comment for final +#rm $RPM_BUILD_ROOT/CD1/README.BETA* %files %defattr(644,root,root,755) @@ -182,6 +173,8 @@ %endif %changelog +* Wed Nov 12 2008 coolo@suse.de +- no more beta eula - only a popup * Mon Nov 10 2008 coolo@suse.de - it's beta5 not rc * Mon Nov 10 2008 coolo@suse.de ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.kO1383/_old 2008-11-17 23:44:53.000000000 +0100 +++ /var/tmp/diff_new_pack.kO1383/_new 2008-11-17 23:44:53.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE (Version 2008.11.10) +# spec file for package skelcd-openSUSE (Version 2008.11.17) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,19 +27,16 @@ Group: Metapackages Conflicts: skelcd-SUSE_Linux skelcd-SUSE_Linux-AddOn skelcd-sles skelcd-sled skelcd-openSUSE-non-OSS skelcd-openSUSE-non-OSS-CD AutoReqProv: off -Version: 2008.11.10 -Release: 2 +Version: 2008.11.17 +Release: 1 Summary: Skeleton for openSUSE OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: skelcd.tar.bz2 Source2: README Source4: license-nonoss.tar.bz2 Source5: license-SL.tar.bz2 -Source6: license-Beta.txt Source7: skelcd-openSUSE-rpmlintrc Source10: README.docudir -# show beta EULA - or final one? -%define beta_eula 1 # changed by pre_checkin %define is_non_oss 0 # define our version @@ -119,14 +116,11 @@ recode utf8..mac $RPM_BUILD_ROOT/CD1/$i.mac.txt %endif done -%if !%{beta_eula} -rm $RPM_BUILD_ROOT/CD1/README.BETA* -%endif # # Copy the right README.BETA or LICENSE.TXT file # # Add infos to license files -for i in license-SL/license* %{SOURCE6}; do +for i in license-SL/license*; do sed -e "s@#DATE#@$DATE_ENG@" \ -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $i \ > $i.new @@ -135,13 +129,8 @@ # EULA.txt contains the Novell EULA, other EULAs and a list # of FOSS licenses. The first part is added here, the rest # is autobuild work -%if %{beta_eula} -cp %{SOURCE6} $RPM_BUILD_ROOT/CD1/EULA.txt -(cp %{SOURCE6} license.txt;tar cvzf license.tar.gz *txt;cp license.tar.gz $RPM_BUILD_ROOT/CD1/) -%else cp license-SL/license.txt $RPM_BUILD_ROOT/CD1/EULA.txt (cd license-SL;tar cvzf license.tar.gz *txt;cp license.tar.gz $RPM_BUILD_ROOT/CD1/) -%endif # docudir stuff # # SuSE manuals @@ -165,6 +154,8 @@ # cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.html $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.html cp -p /usr/share/doc/release-notes/openSUSE/RELEASE-NOTES.en.rtf $RPM_BUILD_ROOT/CD1/docu/RELEASE-NOTES.en.rtf +#comment for final +#rm $RPM_BUILD_ROOT/CD1/README.BETA* %files %defattr(644,root,root,755) @@ -182,6 +173,8 @@ %endif %changelog +* Wed Nov 12 2008 coolo@suse.de +- no more beta eula - only a popup * Mon Nov 10 2008 coolo@suse.de - it's beta5 not rc * Mon Nov 10 2008 coolo@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org