commit skelcd-openSUSE for openSUSE:Factory
Hello community, here is the log from the commit of package skelcd-openSUSE for openSUSE:Factory checked in at Mon Sep 28 17:34:20 CEST 2009. -------- --- skelcd-openSUSE/skelcd-openSUSE-non-OSS.changes 2009-04-08 10:54:16.000000000 +0200 +++ skelcd-openSUSE/skelcd-openSUSE-non-OSS.changes 2009-09-28 17:33:41.035162000 +0200 @@ -1,0 +2,10 @@ +Mon Sep 28 12:25:56 CEST 2009 - coolo@novell.com + +- we should be able to skip README.DOS by now + +------------------------------------------------------------------- +Mon Sep 28 12:22:55 CEST 2009 - coolo@novell.com + +- add startup docu to DVD (bnc#540262) + +------------------------------------------------------------------- skelcd-openSUSE.changes: same change calling whatdependson for head-i586 Old: ---- README.docudir ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-openSUSE-non-OSS.spec ++++++ --- /var/tmp/diff_new_pack.6dOnty/_old 2009-09-28 17:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.6dOnty/_new 2009-09-28 17:33:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE-non-OSS (Version 2009.4.8) +# spec file for package skelcd-openSUSE-non-OSS (Version 2009.9.28) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: skelcd-openSUSE-non-OSS -BuildRequires: build-key opensuse-gnomeuser_en-pdf recode release-notes-openSUSE +BuildRequires: build-key opensuse-startup_de-pdf opensuse-startup_en-pdf recode release-notes-openSUSE %ifarch %ix86 x86_64 BuildRequires: instlux-local pinentry-gtk2 %endif @@ -27,22 +27,21 @@ 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: 2009.4.8 +Version: 2009.9.28 Release: 1 -Summary: Skeleton for openSUSE non-OSS Media Sets +Summary: Skeleton for openSUSE OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: skelcd.tar.bz2 Source2: README Source5: license-SL.tar.bz2 Source7: skelcd-openSUSE-rpmlintrc -Source10: README.docudir # changed by pre_checkin %define is_non_oss 1 # define our version %define distribution_version 11.2 %description -Internal package only, used for openSUSE non-OSS media sets +Internal package only, used for openSUSE OSS Media sets @@ -102,11 +101,6 @@ sed -e "s@#DATE#@$DATE_ENG@" \ -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $RPM_SOURCE_DIR/$i \ > $RPM_BUILD_ROOT/CD1/$i -# no DOS for ppc -%ifnarch ppc - cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.DOS - recode utf8..ibmpc $RPM_BUILD_ROOT/CD1/$i.DOS -%endif # but Mac linebreaks %ifarch ppc cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.mac.txt @@ -134,25 +128,15 @@ # # The SUSE Linux Manuals (PDF) # -# README.docudir -grep -v '^#' %{S:10} > $RPM_BUILD_ROOT/CD1/docu/README -# leave out the documentation on x86_64 -#%ifarch %ix86 ppc ppc64 -#for f in /usr/share/doc/manual/opensuse-{gnomeuser,manual}_*-pdf/*.pdf ; do -# l=${f##*/}; l=${l#*_}; l=${l%\.pdf} -# if [ ! -e $RPM_BUILD_ROOT/CD1/docu/$l ]; then -# mkdir -p $RPM_BUILD_ROOT/CD1/docu/$l -# fi -# test -f $RPM_BUILD_ROOT/CD1/docu/$l || cp -v $f $RPM_BUILD_ROOT/CD1/docu/$l -#done -#%endif +cp /usr/share/doc/manual/opensuse-startup_de-pdf/opensuse-startup_de.pdf $RPM_BUILD_ROOT/CD1/docu/startup_de.pdf +cp /usr/share/doc/manual/opensuse-startup_en-pdf/opensuse-startup_en.pdf $RPM_BUILD_ROOT/CD1/docu/startup_en.pdf # # Install release notes as HTML and rtf (yast rtf) pages # 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 # uncomment for final -rm $RPM_BUILD_ROOT/CD1/README.BETA* +#rm $RPM_BUILD_ROOT/CD1/README.BETA* %files %defattr(644,root,root,755) ++++++ skelcd-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.6dOnty/_old 2009-09-28 17:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.6dOnty/_new 2009-09-28 17:33:52.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package skelcd-openSUSE (Version 2009.4.8) +# spec file for package skelcd-openSUSE (Version 2009.9.28) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ Name: skelcd-openSUSE -BuildRequires: build-key opensuse-gnomeuser_en-pdf recode release-notes-openSUSE +BuildRequires: build-key opensuse-startup_de-pdf opensuse-startup_en-pdf recode release-notes-openSUSE %ifarch %ix86 x86_64 BuildRequires: instlux-local pinentry-gtk2 %endif @@ -27,7 +27,7 @@ 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: 2009.4.8 +Version: 2009.9.28 Release: 1 Summary: Skeleton for openSUSE OSS Media Sets BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,7 +35,6 @@ Source2: README Source5: license-SL.tar.bz2 Source7: skelcd-openSUSE-rpmlintrc -Source10: README.docudir # changed by pre_checkin %define is_non_oss 0 # define our version @@ -102,11 +101,6 @@ sed -e "s@#DATE#@$DATE_ENG@" \ -e"s@#VERSION#@$BUILD_DISTRIBUTION_VERSION@" $RPM_SOURCE_DIR/$i \ > $RPM_BUILD_ROOT/CD1/$i -# no DOS for ppc -%ifnarch ppc - cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.DOS - recode utf8..ibmpc $RPM_BUILD_ROOT/CD1/$i.DOS -%endif # but Mac linebreaks %ifarch ppc cp $RPM_BUILD_ROOT/CD1/$i $RPM_BUILD_ROOT/CD1/$i.mac.txt @@ -134,25 +128,15 @@ # # The SUSE Linux Manuals (PDF) # -# README.docudir -grep -v '^#' %{S:10} > $RPM_BUILD_ROOT/CD1/docu/README -# leave out the documentation on x86_64 -#%ifarch %ix86 ppc ppc64 -#for f in /usr/share/doc/manual/opensuse-{gnomeuser,manual}_*-pdf/*.pdf ; do -# l=${f##*/}; l=${l#*_}; l=${l%\.pdf} -# if [ ! -e $RPM_BUILD_ROOT/CD1/docu/$l ]; then -# mkdir -p $RPM_BUILD_ROOT/CD1/docu/$l -# fi -# test -f $RPM_BUILD_ROOT/CD1/docu/$l || cp -v $f $RPM_BUILD_ROOT/CD1/docu/$l -#done -#%endif +cp /usr/share/doc/manual/opensuse-startup_de-pdf/opensuse-startup_de.pdf $RPM_BUILD_ROOT/CD1/docu/startup_de.pdf +cp /usr/share/doc/manual/opensuse-startup_en-pdf/opensuse-startup_en.pdf $RPM_BUILD_ROOT/CD1/docu/startup_en.pdf # # Install release notes as HTML and rtf (yast rtf) pages # 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 # uncomment for final -rm $RPM_BUILD_ROOT/CD1/README.BETA* +#rm $RPM_BUILD_ROOT/CD1/README.BETA* %files %defattr(644,root,root,755) ++++++ README ++++++ --- /var/tmp/diff_new_pack.6dOnty/_old 2009-09-28 17:33:52.000000000 +0200 +++ /var/tmp/diff_new_pack.6dOnty/_new 2009-09-28 17:33:52.000000000 +0200 @@ -1,30 +1,16 @@ -EULA.txt contains Novell's standard End User License Agreement for openSUSE. -License rights with respect to individual components are normally defined -by the terms accompanying such components (such as COPYING files or -copyright headers). - -Translations of openSUSE EULA are available in the directory media.1/license. -These translations are for reference only. The English version remains authoritative. - The complete text of the GNU General Public Licenses are available in GPLv2.txt (version 2) and GPLv3.txt (version 3). They define the license terms of many components within this distribution, but not the distribution as a whole. -A README.Beta file is present and effective while the product is in +A README.BETA file is present and effective while the product is in preproduction phase. -Third party license terms may require confirmation during installation. -We have appended those license terms to our EULA.txt for reference. -An authoritative individual must accept such licenses or not install the -corresponding packages. - - ############################################################# Sources for development releases are not distributed by mirrors to reduce the bandwidth and storage on these mirrors. You can always find the latest source at -http://download.opensuse.org/factory/ +http://download.opensuse.org/source/factory Alternatively, see http://www.novell.com/products/opensuse/source_code.html ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de