Hello community, here is the log from the commit of package openSUSE-release checked in at Wed Sep 17 11:38:45 CEST 2008. -------- --- openSUSE-release/openSUSE-release.changes 2008-09-10 15:27:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/openSUSE-release/openSUSE-release.changes 2008-09-17 11:29:13.790696000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 17 11:22:03 CEST 2008 - adrian@suse.de + +- recreate spec file with product converter + * fixes missing dependency to flavor packages + * add updaterepokey + +------------------------------------------------------------------- Old: ---- get_version_number.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.a22638/_old 2008-09-17 11:37:20.000000000 +0200 +++ /var/tmp/diff_new_pack.a22638/_new 2008-09-17 11:37:20.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-release (Version 11.0.42) +# spec file for package openSUSE-release (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,28 +21,26 @@ %define product openSUSE # what's the default flavor ? %define flavor none -%define real_version 11.1 -%define ncc_target opensuse-11.1 License: BSD 3-Clause Group: System/Fhs -Version: 11.0.42 -Release: 42 +Version: 11.1 +Release: 1 Provides: aaa_version distribution-release Provides: suse-release-oss = %{version}-%{release} Provides: suse-release = %{version}-%{release} -# Code11 product Provides: product() Provides: product(%{product}) = %{version}-%{release} +Requires: product_flavor(%{product}) = %{version}-%{release} Obsoletes: aaa_version Obsoletes: suse-release-oss <= 10.0 suse-release <= 10.1.42 Conflicts: sles-release <= 10 sled-release <= 10 core-release <= 10 BuildRequires: skelcd-control-openSUSE AutoReqProv: on Summary: SuSE release version files +ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils -ExclusiveArch: %ix86 x86_64 ia64 ppc ppc64 s390x -%define betaversion "-Alpha3plus" +%define betaversion Beta1 %description This package contains the files: /etc/SuSE-release, /etc/issue, @@ -58,6 +56,7 @@ %define flavor ftp License: BSD 3-Clause Group: System/Fhs +Provides: product_flavor(openSUSE) = %{version}-%{release} Summary: SuSE release version files %description ftp @@ -75,31 +74,11 @@ %dir /etc/products.d /etc/products.d/openSUSE-ftp.prod -%package dvd9 -%define flavor dvd9 -License: BSD 3-Clause -Group: System/Fhs -Summary: SuSE release version files - -%description dvd9 -This package contains the files: /etc/SuSE-release, /etc/issue, -/etc/issue.net, and /etc/products.d/openSUSE.prod - - - -Authors: --------- - ro@suse.de - -%files dvd9 -%defattr(-,root,root) -%dir /etc/products.d -/etc/products.d/openSUSE-dvd9.prod - %package dvd5 %define flavor dvd5 License: BSD 3-Clause Group: System/Fhs +Provides: product_flavor(openSUSE) = %{version}-%{release} Summary: SuSE release version files %description dvd5 @@ -117,13 +96,14 @@ %dir /etc/products.d /etc/products.d/openSUSE-dvd5.prod -%package livedvd5 -%define flavor livedvd5 +%package dvd9 +%define flavor dvd9 License: BSD 3-Clause Group: System/Fhs +Provides: product_flavor(openSUSE) = %{version}-%{release} Summary: SuSE release version files -%description livedvd5 +%description dvd9 This package contains the files: /etc/SuSE-release, /etc/issue, /etc/issue.net, and /etc/products.d/openSUSE.prod @@ -133,10 +113,10 @@ -------- ro@suse.de -%files livedvd5 +%files dvd9 %defattr(-,root,root) %dir /etc/products.d -/etc/products.d/openSUSE-livedvd5.prod +/etc/products.d/openSUSE-dvd9.prod %prep @@ -154,55 +134,168 @@ echo $RPM_BUILD_ROOT cp -av /CD1/control.xml $RPM_BUILD_ROOT/etc/YaST2/ mkdir -p $RPM_BUILD_ROOT/etc/products.d -for flavor in ftp dvd5 dvd9 livedvd5; do -cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-${flavor}.prod << EOF +cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-ftp.prod << EOF <?xml version="1.0" encoding="UTF-8"?> -<product schemeversion="0"> +<product id="openSUSE" schemeversion="0"> <vendor>Novell</vendor> - <name>%{product}</name> - <version>%{real_version}</version> + <name>openSUSE</name> + <version>11.1</version> <release>0</release> - <arch>%{_target_cpu}</arch> + <register> + <target>openSUSE-11.1-%{_target_cpu}</target> + <release></release> + <flavor>ftp</flavor> + </register> <updaterepokey>000000000</updaterepokey> - <summary>The free openSUSE distribution</summary> - <description>This is the coolest distribution on the world. - Try it out and find it useful.</description> + <summary>The openSUSE Distribution</summary> + <description>openSUSE is a distribution by the openSUSE.org project.</description> <linguas> - <lang>da</lang> - <lang>de</lang> + <language>cs</language> + <language>da</language> + <language>de</language> + <language>en</language> + <language>en_GB</language> + <language>en_US</language> + <language>es</language> + <language>fi</language> + <language>fr</language> + <language>hu</language> + <language>it</language> + <language>ja</language> + <language>nb</language> + <language>nl</language> + <language>pl</language> + <language>pt</language> + <language>pt_BR</language> + <language>ru</language> + <language>sv</language> + <language>zh</language> + <language>zh_CN</language> + <language>zh_TW</language> </linguas> <urls> - <url name="releasenotes">http://www.suse.com/relnotes/i386/openSUSE/11.1/release-notes-openSUSE.rpm</url> + <url name="releasenotes">http://www.suse.com/relnotes/i386/openSUSE/11.0.42/release-notes-openSUSE.rp...</url> <url name="smolt">http://smolt.opensuse.org/register.pl</url> - <url name="register">http://register.opensuse.org/</url> + <url name="register">http://register.novell.com/</url> </urls> + <buildconfig producttheme="openSUSE" betaversion="Beta1"> + <allowresolving>false</allowresolving> + </buildconfig> + <installconfig defaultlang="en_US" datadir="suse" descriptiondir="suse/setup/descr"> + <releasepackage name="openSUSE-release" flag="=" version="11.0.42" /> + <distribution>openSUSE</distribution> + </installconfig> + <runtimeconfig /> +</product> +EOF +cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-dvd5.prod << EOF +<?xml version="1.0" encoding="UTF-8"?> +<product id="openSUSE" schemeversion="0"> + <vendor>Novell</vendor> + <name>openSUSE</name> + <version>11.1</version> + <release>0</release> <register> - <target>%{ncc_target}-%%{_target_cpu}</target> + <target>openSUSE-11.1-%{_target_cpu}</target> <release></release> - <flavor>$flavor</flavor> + <flavor>dvd5</flavor> </register> - <buildconfig> - <!-- This section is needed to generate the installation media --> - <producttheme>SUSE</producttheme> - <betaversion>-%{betaversion}</betaversion> - <allowresolving>true</allowresolving> - <packagemanager>zypper</packagemanager> + <updaterepokey>000000000</updaterepokey> + <summary>The openSUSE Distribution</summary> + <description>openSUSE is a distribution by the openSUSE.org project.</description> + <linguas> + <language>cs</language> + <language>da</language> + <language>de</language> + <language>en</language> + <language>en_GB</language> + <language>en_US</language> + <language>es</language> + <language>fi</language> + <language>fr</language> + <language>hu</language> + <language>it</language> + <language>ja</language> + <language>nb</language> + <language>nl</language> + <language>pl</language> + <language>pt</language> + <language>pt_BR</language> + <language>ru</language> + <language>sv</language> + <language>zh</language> + <language>zh_CN</language> + <language>zh_TW</language> + </linguas> + <urls> + <url name="releasenotes">http://www.suse.com/relnotes/i386/openSUSE/11.0.42/release-notes-openSUSE.rp...</url> + <url name="smolt">http://smolt.opensuse.org/register.pl</url> + <url name="register">http://register.novell.com/</url> + </urls> + <buildconfig producttheme="openSUSE" betaversion="Beta1"> + <allowresolving>false</allowresolving> </buildconfig> - <installconfig> - <!-- All flags needed during installation --> - <defaultlang>en_US</defaultlang> - <!-- needed for current content file --> - <datadir>suse</datadir> - <descrdir>suse/setup/descr</descrdir> - <references name="%{name}" version="%{version}"/> + <installconfig defaultlang="en_US" datadir="suse" descriptiondir="suse/setup/descr"> + <releasepackage name="openSUSE-release" flag="=" version="11.0.42" /> <distribution>openSUSE</distribution> </installconfig> - <runtimeconfig> - <!-- All Flags needed in the running system --> - </runtimeconfig> + <runtimeconfig /> +</product> +EOF +cat >$RPM_BUILD_ROOT/etc/products.d/openSUSE-dvd9.prod << EOF +<?xml version="1.0" encoding="UTF-8"?> +<product id="openSUSE" schemeversion="0"> + <vendor>Novell</vendor> + <name>openSUSE</name> + <version>11.1</version> + <release>0</release> + <register> + <target>openSUSE-11.1-%{_target_cpu}</target> + <release></release> + <flavor>dvd9</flavor> + </register> + <updaterepokey>000000000</updaterepokey> + <summary>The openSUSE Distribution</summary> + <description>openSUSE is a distribution by the openSUSE.org project.</description> + <linguas> + <language>cs</language> + <language>da</language> + <language>de</language> + <language>en</language> + <language>en_GB</language> + <language>en_US</language> + <language>es</language> + <language>fi</language> + <language>fr</language> + <language>hu</language> + <language>it</language> + <language>ja</language> + <language>nb</language> + <language>nl</language> + <language>pl</language> + <language>pt</language> + <language>pt_BR</language> + <language>ru</language> + <language>sv</language> + <language>zh</language> + <language>zh_CN</language> + <language>zh_TW</language> + </linguas> + <urls> + <url name="releasenotes">http://www.suse.com/relnotes/i386/openSUSE/11.0.42/release-notes-openSUSE.rp...</url> + <url name="smolt">http://smolt.opensuse.org/register.pl</url> + <url name="register">http://register.novell.com/</url> + </urls> + <buildconfig producttheme="openSUSE" betaversion="Beta1"> + <allowresolving>false</allowresolving> + </buildconfig> + <installconfig defaultlang="en_US" datadir="suse" descriptiondir="suse/setup/descr"> + <releasepackage name="openSUSE-release" flag="=" version="11.0.42" /> + <distribution>openSUSE</distribution> + </installconfig> + <runtimeconfig /> </product> EOF -done %post rm -rf /etc/zypp/products.d @@ -216,8 +309,11 @@ %config /etc/motd %config(noreplace) /etc/issue %config(noreplace) /etc/issue.net - %changelog +* Wed Sep 17 2008 adrian@suse.de +- recreate spec file with product converter + * fixes missing dependency to flavor packages + * add updaterepokey * Wed Sep 10 2008 ro@suse.de - use ExclusiveArch instead of BuildArch * Wed Sep 10 2008 schwab@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