Hello community, here is the log from the commit of package skelcd-openSUSE checked in at Tue Nov 25 16:11:37 CET 2008. -------- --- skelcd-openSUSE/skelcd-openSUSE.changes 2008-11-20 14:13:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-openSUSE/skelcd-openSUSE.changes 2008-11-25 12:48:13.284164000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 25 12:47:55 CET 2008 - coolo@suse.de + +- the license is not an agreement anymore (bnc#448598) + +------------------------------------------------------------------- skelcd-openSUSE-non-OSS.changes: same change calling whatdependson for head-i586 Old: ---- license-nonoss.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE-non-OSS.spec ++++++ --- /var/tmp/diff_new_pack.W27552/_old 2008-11-25 16:11:15.000000000 +0100 +++ /var/tmp/diff_new_pack.W27552/_new 2008-11-25 16:11:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE-non-OSS (Version 2008.11.20) +# spec file for package skelcd-openSUSE-non-OSS (Version 2008.11.25) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,13 +27,12 @@ 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.20 +Version: 2008.11.25 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 Source7: skelcd-openSUSE-rpmlintrc Source10: README.docudir @@ -64,9 +63,7 @@ %prep %setup -n skelcd -%if %is_non_oss -tar xvf %{S:4} -%else +%if !%is_non_oss tar xvf %{S:5} %endif @@ -116,21 +113,21 @@ recode utf8..mac $RPM_BUILD_ROOT/CD1/$i.mac.txt %endif done +%if !%is_non_oss # # Copy the right README.BETA or LICENSE.TXT file # # Add infos to license files for i in license-SL/license*; do - sed -e "s@#DATE#@$DATE_ENG@" \ - -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $i \ - > $i.new - mv $i.new $i + sed -i -e "s@#DATE#@$DATE_ENG@" \ + -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $i done -# 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 -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/) +pushd license-SL +touch no-acceptance-needed +tar cvzf license.tar.gz *txt no-acceptance-needed +cp license.tar.gz $RPM_BUILD_ROOT/CD1/ +popd +%endif # docudir stuff # # SuSE manuals @@ -173,6 +170,8 @@ %endif %changelog +* Tue Nov 25 2008 coolo@suse.de +- the license is not an agreement anymore (bnc#448598) * Thu Nov 20 2008 coolo@suse.de - now back to rc * Wed Nov 12 2008 coolo@suse.de ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.W27552/_old 2008-11-25 16:11:15.000000000 +0100 +++ /var/tmp/diff_new_pack.W27552/_new 2008-11-25 16:11:15.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE (Version 2008.11.20) +# spec file for package skelcd-openSUSE (Version 2008.11.25) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,13 +27,12 @@ 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.20 +Version: 2008.11.25 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 Source7: skelcd-openSUSE-rpmlintrc Source10: README.docudir @@ -64,9 +63,7 @@ %prep %setup -n skelcd -%if %is_non_oss -tar xvf %{S:4} -%else +%if !%is_non_oss tar xvf %{S:5} %endif @@ -116,21 +113,21 @@ recode utf8..mac $RPM_BUILD_ROOT/CD1/$i.mac.txt %endif done +%if !%is_non_oss # # Copy the right README.BETA or LICENSE.TXT file # # Add infos to license files for i in license-SL/license*; do - sed -e "s@#DATE#@$DATE_ENG@" \ - -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $i \ - > $i.new - mv $i.new $i + sed -i -e "s@#DATE#@$DATE_ENG@" \ + -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $i done -# 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 -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/) +pushd license-SL +touch no-acceptance-needed +tar cvzf license.tar.gz *txt no-acceptance-needed +cp license.tar.gz $RPM_BUILD_ROOT/CD1/ +popd +%endif # docudir stuff # # SuSE manuals @@ -173,6 +170,8 @@ %endif %changelog +* Tue Nov 25 2008 coolo@suse.de +- the license is not an agreement anymore (bnc#448598) * Thu Nov 20 2008 coolo@suse.de - now back to rc * Wed Nov 12 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