Hello community, here is the log from the commit of package skelcd-openSUSE checked in at Mon Nov 10 10:34:11 CET 2008. -------- --- skelcd-openSUSE/skelcd-openSUSE.changes 2008-11-09 18:45:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/skelcd-openSUSE/skelcd-openSUSE.changes 2008-11-10 10:30:32.764600000 +0100 @@ -1,0 +2,5 @@ +Mon Nov 10 10:30:25 CET 2008 - coolo@suse.de + +- only take the new license for oss media + +------------------------------------------------------------------- skelcd-openSUSE-non-OSS.changes: same change calling whatdependson for head-i586 New: ---- license-nonoss.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE-non-OSS.spec ++++++ --- /var/tmp/diff_new_pack.kn9316/_old 2008-11-10 10:33:32.000000000 +0100 +++ /var/tmp/diff_new_pack.kn9316/_new 2008-11-10 10:33:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE-non-OSS (Version 2008.11.9) +# spec file for package skelcd-openSUSE-non-OSS (Version 2008.11.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,18 +21,19 @@ Name: skelcd-openSUSE-non-OSS BuildRequires: build-key opensuse-gnomeuser_en-pdf recode release-notes-openSUSE %ifarch %ix86 x86_64 -BuildRequires: instlux-local +BuildRequires: instlux-local pinentry-gtk2 %endif License: YaST License 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.9 +Version: 2008.11.10 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 @@ -65,14 +66,12 @@ %endif %prep -%setup -n skelcd -a 5 -pushd license-SL -if test %name = skelcd-openSUSE-non-OSS; then - for f in *; do - grep openSUSE-OSS $f || exit 1 - sed -e "s,openSUSE-OSS,openSUSE," $f > $f.new && mv $f.new $f - done -fi +%setup -n skelcd +%if %is_non_oss +tar xvf %{S:4} +%else +tar xvf %{S:5} +%endif %build @@ -183,6 +182,8 @@ %endif %changelog +* Mon Nov 10 2008 coolo@suse.de +- only take the new license for oss media * Sun Nov 09 2008 coolo@suse.de - new license from legal * Fri Oct 24 2008 coolo@suse.de ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.kn9316/_old 2008-11-10 10:33:32.000000000 +0100 +++ /var/tmp/diff_new_pack.kn9316/_new 2008-11-10 10:33:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE (Version 2008.11.9) +# spec file for package skelcd-openSUSE (Version 2008.11.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,18 +21,19 @@ Name: skelcd-openSUSE BuildRequires: build-key opensuse-gnomeuser_en-pdf recode release-notes-openSUSE %ifarch %ix86 x86_64 -BuildRequires: instlux-local +BuildRequires: instlux-local pinentry-gtk2 %endif License: YaST License 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.9 +Version: 2008.11.10 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 @@ -65,14 +66,12 @@ %endif %prep -%setup -n skelcd -a 5 -pushd license-SL -if test %name = skelcd-openSUSE-non-OSS; then - for f in *; do - grep openSUSE-OSS $f || exit 1 - sed -e "s,openSUSE-OSS,openSUSE," $f > $f.new && mv $f.new $f - done -fi +%setup -n skelcd +%if %is_non_oss +tar xvf %{S:4} +%else +tar xvf %{S:5} +%endif %build @@ -183,6 +182,8 @@ %endif %changelog +* Mon Nov 10 2008 coolo@suse.de +- only take the new license for oss media * Sun Nov 09 2008 coolo@suse.de - new license from legal * Fri Oct 24 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