Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Thu Jul 17 23:17:03 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-06-09 14:56:20.000000000 +0200 +++ kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-07-17 23:14:43.804765000 +0200 @@ -1,0 +2,5 @@ +Thu Jul 17 09:32:47 CEST 2008 - coolo@suse.de + +- adapt to 11.1 + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.qs8596/_old 2008-07-17 23:16:23.000000000 +0200 +++ /var/tmp/diff_new_pack.qs8596/_new 2008-07-17 23:16:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi-image-livecd-gnome (Version 11.0) +# spec file for package kiwi-image-livecd-gnome (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ BuildRequires: boo gfxboot BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD -Version: 11.0 -Release: 113 +Version: 11.1 +Release: 1 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -79,7 +79,7 @@ install -m 755 %{SOURCE3} config.sh (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | \ xmllint --format - > config.xml -cp -rL /usr/share/kiwi/image/oemboot/suse-11.0/ myoem +cp -rL /usr/share/kiwi/image/oemboot/suse-11.1/ myoem install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -87,7 +87,7 @@ cd config-cdroot install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt install -m 644 /usr/share/doc/licenses/gpl-3.0.txt GPLv3.txt -install -m 644 /CD1/README* /CD1/EULA.txt /CD1/SuSEgo.ico /CD1/autorun.inf . +install -m 644 /CD1/README* /CD1/EULA.txt . tar czf ../config-cdroot.tgz * cd .. rm -rf config-cdroot @@ -166,6 +166,8 @@ /usr/share/openSUSE %changelog +* Thu Jul 17 2008 coolo@suse.de +- adapt to 11.1 * Mon Jun 09 2008 coolo@suse.de - SoftLock again some recommends (bnc#398367) * Sun Jun 08 2008 coolo@suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.qs8596/_old 2008-07-17 23:16:23.000000000 +0200 +++ /var/tmp/diff_new_pack.qs8596/_new 2008-07-17 23:16:23.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi-image-livecd-kde (Version 11.0) +# spec file for package kiwi-image-livecd-kde (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -28,8 +28,8 @@ BuildRequires: boo gfxboot BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD -Version: 11.0 -Release: 113 +Version: 11.1 +Release: 1 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -79,7 +79,7 @@ install -m 755 %{SOURCE3} config.sh (sed -n -e '1,/ PACKAGES BEGIN/p' %{SOURCE4} ; cat $cdlist | while read pack; do echo '<package name="'$pack'"/>'; done; sed -n -e '/ PACKAGES END/,$p' %{SOURCE4} ) | \ xmllint --format - > config.xml -cp -rL /usr/share/kiwi/image/oemboot/suse-11.0/ myoem +cp -rL /usr/share/kiwi/image/oemboot/suse-11.1/ myoem install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml @@ -87,7 +87,7 @@ cd config-cdroot install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt install -m 644 /usr/share/doc/licenses/gpl-3.0.txt GPLv3.txt -install -m 644 /CD1/README* /CD1/EULA.txt /CD1/SuSEgo.ico /CD1/autorun.inf . +install -m 644 /CD1/README* /CD1/EULA.txt . tar czf ../config-cdroot.tgz * cd .. rm -rf config-cdroot @@ -166,6 +166,8 @@ /usr/share/openSUSE %changelog +* Thu Jul 17 2008 coolo@suse.de +- adapt to 11.1 * Mon Jun 09 2008 coolo@suse.de - SoftLock again some recommends (bnc#398367) * Sun Jun 08 2008 coolo@suse.de ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-06-08 12:27:14.000000000 +0200 +++ kiwi-image-livecd-kde/config.sh 2008-07-17 08:20:20.456036000 +0200 @@ -59,12 +59,9 @@ rm -rf /var/cache/zypp/raw/* # TODO: take them directly out of control.xml -zypper addrepo -d http://download.opensuse.org/distribution/11.0/repo/oss/ "openSUSE-11.0-Oss" -zypper addrepo -d http://download.opensuse.org/distribution/11.0/repo/non-oss/ "openSUSE-11.0-Non-Oss" -zypper addrepo -d http://download.opensuse.org/update/11.0/ "openSUSE-11.0-Updates" -zypper mr -p 120 "openSUSE-11.0-Oss" -zypper mr -p 120 "openSUSE-11.0-Non-Oss" -zypper mr -p 20 "openSUSE-11.0-Updates" +zypper addrepo -d http://download.opensuse.org/distribution/11.1/repo/oss/ "openSUSE-11.1-Oss" +zypper addrepo -d http://download.opensuse.org/distribution/11.1/repo/non-oss/ "openSUSE-11.1-Non-Oss" +zypper addrepo -d http://download.opensuse.org/update/11.1/ "openSUSE-11.1-Updates" rm -rf /var/cache/zypp/raw/* ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-06-03 13:20:06.000000000 +0200 +++ kiwi-image-livecd-kde/config.xml.in 2008-07-17 08:19:14.954604000 +0200 @@ -1,14 +1,14 @@ <?xml version="1.0"?> -<image schemeversion="2.0" name="openSUSE-11.0"> +<image schemeversion="2.0" name="openSUSE-11.1"> <description type="system"> <author>Stephan Kulow</author> <contact>coolo@novell.com</contact> - <specification>openSUSE 11.0 Live system</specification> + <specification>openSUSE 11.1 Live system</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-11.0" flags="unified">iso</type> - <type boot="vmxboot/suse-11.0" filesystem="ext3" format="vmdk">vmx</type> - <type boot="xenboot/suse-11.0" filesystem="ext3">xen</type> + <type primary="true" boot="isoboot/suse-11.1" flags="unified">iso</type> + <type boot="vmxboot/suse-11.1" filesystem="ext3" format="vmdk">vmx</type> + <type boot="xenboot/suse-11.1" filesystem="ext3">xen</type> <type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type> <version>2.7.0</version> <size unit="M">780</size> ++++++ correct_live_install ++++++ --- arch/i686/kiwi-image-livecd-kde/correct_live_install 2008-06-08 19:49:18.000000000 +0200 +++ kiwi-image-livecd-kde/correct_live_install 2008-07-17 08:19:48.447075000 +0200 @@ -54,7 +54,7 @@ rm /usr/sbin/configure-x.sh cd /etc/zypp/repos.d -for i in openSUSE-11.0-Oss openSUSE-11.0-Non-Oss openSUSE-11.0-Updates; do +for i in openSUSE-11.1-Oss openSUSE-11.1-Non-Oss openSUSE-11.1-Updates; do sed -i -e "s,enabled=0,enabled=1," $i.repo done ++++++ openSUSE-release.prod ++++++ --- arch/i686/kiwi-image-livecd-kde/openSUSE-release.prod 2008-05-12 12:55:53.000000000 +0200 +++ kiwi-image-livecd-kde/openSUSE-release.prod 2008-07-17 08:16:41.709002000 +0200 @@ -1,3 +1,3 @@ -[openSUSE 11.0 %arch] +[openSUSE 11.1 %arch] distproduct=@NAME@ -distversion=11.0-Beta3 +distversion=11.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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