Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Tue Jun 3 15:55:20 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-06-02 10:31:25.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-06-03 15:54:06.046337000 +0200 @@ -1,0 +2,7 @@ +Tue Jun 3 10:00:21 CEST 2008 - coolo@suse.de + +- fix build requires +- remove most of the softlocks, should not be necessary any longer +- tag the media for checkmedia + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- SoftLocks ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.a30513/_old 2008-06-03 15:54:55.000000000 +0200 +++ /var/tmp/diff_new_pack.a30513/_new 2008-06-03 15:54:55.000000000 +0200 @@ -14,10 +14,10 @@ Name: kiwi-image-livecd-gnome Url: http://kiwi.berlios.de/ BuildRequires: createrepo kiwi kiwi-desc-isoboot package-lists-openSUSE-GNOME-cd -BuildRequires: fdupes kiwi-desc-oemboot kiwi-desc-usbboot kiwi-tools smart squashfs +BuildRequires: checkmedia fdupes kiwi-desc-oemboot kiwi-desc-usbboot kiwi-tools smart squashfs BuildRequires: bundle-lang-common-en cracklib-dict-small lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang -BuildRequires: licenses opensuse-manual_en-pdf skelcd-control-openSUSE-CD skelcd-openSUSE-CD +BuildRequires: licenses opensuse-manual_en-pdf skelcd-control-openSUSE skelcd-openSUSE-CD # the following are listed as needed without a way for me to track it # without solving and I have no idea how to do that automatically. # simply remove them and try to build - kiwi/zypper will then complain @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.0 -Release: 106 +Release: 107 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +44,6 @@ Source10: create_xconf Source11: configure-x.sh Source12: correct_live_install -Source13: SoftLocks Source14: config.oempartition Source15: openSUSE-release.prod Source16: boot.langset @@ -80,7 +79,7 @@ cp -rL /usr/share/kiwi/image/oemboot/suse-11.0/ myoem install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem -sed -i -e 's,@OEM@,%{_builddir}/%{name}-%{version}/config/myoem,' config.xml +sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml mkdir config-cdroot cd config-cdroot # I know this looks weird in the kde.spec, but GNOME is replaced with GNOME to generate gnome.spec @@ -111,7 +110,6 @@ cat %{SOURCE6} >> tmp/config.patch sed -e "s,@NAME@,openSUSE-Live-GNOME," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod fi -install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf @@ -126,14 +124,14 @@ mkdir tmp out rm -rf /home/rpmdir mkdir -p /home/rpmdir/rpms -for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools; do +for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep -v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list diff -u wanted.list installed.list -kiwi --logfile terminal --create $PWD/tmp -d $PWD/out +kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem umount -f tmp/base-system/home/rpmdir || true @@ -163,6 +161,10 @@ /usr/share/openSUSE %changelog +* Tue Jun 03 2008 coolo@suse.de +- fix build requires +- remove most of the softlocks, should not be necessary any longer +- tag the media for checkmedia * Mon Jun 02 2008 coolo@suse.de - switch to 11.0 URLs (bnc#395316) * Thu May 29 2008 coolo@suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.a30513/_old 2008-06-03 15:54:55.000000000 +0200 +++ /var/tmp/diff_new_pack.a30513/_new 2008-06-03 15:54:55.000000000 +0200 @@ -14,10 +14,10 @@ Name: kiwi-image-livecd-kde Url: http://kiwi.berlios.de/ BuildRequires: createrepo kiwi kiwi-desc-isoboot package-lists-openSUSE-KDE-cd -BuildRequires: fdupes kiwi-desc-oemboot kiwi-desc-usbboot kiwi-tools smart squashfs +BuildRequires: checkmedia fdupes kiwi-desc-oemboot kiwi-desc-usbboot kiwi-tools smart squashfs BuildRequires: bundle-lang-common-en cracklib-dict-small lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang -BuildRequires: licenses opensuse-manual_en-pdf skelcd-control-openSUSE-CD skelcd-openSUSE-CD +BuildRequires: licenses opensuse-manual_en-pdf skelcd-control-openSUSE skelcd-openSUSE-CD # the following are listed as needed without a way for me to track it # without solving and I have no idea how to do that automatically. # simply remove them and try to build - kiwi/zypper will then complain @@ -28,7 +28,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.0 -Release: 106 +Release: 107 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,7 +44,6 @@ Source10: create_xconf Source11: configure-x.sh Source12: correct_live_install -Source13: SoftLocks Source14: config.oempartition Source15: openSUSE-release.prod Source16: boot.langset @@ -80,7 +79,7 @@ cp -rL /usr/share/kiwi/image/oemboot/suse-11.0/ myoem install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem -sed -i -e 's,@OEM@,%{_builddir}/%{name}-%{version}/config/myoem,' config.xml +sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml mkdir config-cdroot cd config-cdroot # I know this looks weird in the kde.spec, but KDE is replaced with GNOME to generate gnome.spec @@ -111,7 +110,6 @@ cat %{SOURCE6} >> tmp/config.patch sed -e "s,@NAME@,openSUSE-Live-KDE," %{SOURCE15} > etc/zypp/products.d/openSUSE-release.prod fi -install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 tar xvf %{SOURCE9} install -D -m 755 %{SOURCE10} etc/init.d/create_xconf @@ -126,14 +124,14 @@ mkdir tmp out rm -rf /home/rpmdir mkdir -p /home/rpmdir/rpms -for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools; do +for i in `cat wanted.list` aufs aufs-kmp-default fribidi gfxboot-devel make squashfs syslinux mtools cromfs patch yast2-live-installer libgomp43 memtest86+ libfuse2 cracklib-dict-small kiwi-tools checkmedia; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir kiwi --logfile terminal --root $PWD/tmp --prepare $PWD/config rpm -r $PWD/tmp -qa | grep -v gpg-pubkey | grep -v yast2-live-installer | grep -v patch | sed -e 's,-[^-]*-[^-]*$,,' | sort -u > installed.list diff -u wanted.list installed.list -kiwi --logfile terminal --create $PWD/tmp -d $PWD/out +kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --isocheck kiwi --logfile terminal --create $PWD/tmp -d $PWD/out --type oem umount -f tmp/base-system/home/rpmdir || true @@ -163,6 +161,10 @@ /usr/share/openSUSE %changelog +* Tue Jun 03 2008 coolo@suse.de +- fix build requires +- remove most of the softlocks, should not be necessary any longer +- tag the media for checkmedia * Mon Jun 02 2008 coolo@suse.de - switch to 11.0 URLs (bnc#395316) * Thu May 29 2008 coolo@suse.de ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-05-20 13:06:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in 2008-06-03 13:20:06.405413000 +0200 @@ -9,7 +9,7 @@ <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 boot="@OEM@" filesystem="squashfs" flags="unified">oem</type> + <type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type> <version>2.7.0</version> <size unit="M">780</size> <packagemanager>zypper</packagemanager> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org