Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Mon Aug 11 23:00:20 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-11 12:22:01.000000000 +0200 +++ kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-11 22:57:18.973941000 +0200 @@ -1,0 +2,5 @@ +Mon Aug 11 13:12:33 CEST 2008 - coolo@suse.de + +- don't use cracklib-dict-small + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change Old: ---- myoem.diff New: ---- kiwi-config.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.O20891/_old 2008-08-11 22:58:32.000000000 +0200 +++ /var/tmp/diff_new_pack.O20891/_new 2008-08-11 22:58:32.000000000 +0200 @@ -22,7 +22,7 @@ Url: http://kiwi.berlios.de/ BuildRequires: createrepo kiwi kiwi-desc-isoboot package-lists-openSUSE-GNOME-cd 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: bundle-lang-common-en lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: opensuse-gnomequick_en-pdf yast2-firstboot @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 6 +Release: 8 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,7 @@ Source14: config.oempartition Source16: boot.langset Source17: 99-ignore-live-usb.fdi -Source18: myoem.diff +Source18: kiwi-config.diff Source19: config-usb.patch Source20: geturls.xsl ExcludeArch: ia64 ppc64 s390x s390 ppc @@ -94,11 +94,14 @@ suseversion=11.1 %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem -patch myoem/config.xml %{SOURCE18} +cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso +patch -p0 < %{SOURCE18} # do not package it rm -f myoem/config.xml.orig +rm -f myiso/config.xml.orig install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem +kiwi --createhash myiso sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml sed -i -e "s,@VERSION@,$suseversion," config.xml mkdir config-cdroot @@ -145,7 +148,7 @@ 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 checkmedia yast2-firstboot; 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 kiwi-tools checkmedia yast2-firstboot; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -199,6 +202,8 @@ %changelog * Mon Aug 11 2008 coolo@suse.de +- don't use cracklib-dict-small +* Mon Aug 11 2008 coolo@suse.de - remove possible outcome of patch * Sat Aug 09 2008 coolo@suse.de - remove unneeded buildrequire ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.O20891/_old 2008-08-11 22:58:32.000000000 +0200 +++ /var/tmp/diff_new_pack.O20891/_new 2008-08-11 22:58:32.000000000 +0200 @@ -22,7 +22,7 @@ Url: http://kiwi.berlios.de/ BuildRequires: createrepo kiwi kiwi-desc-isoboot package-lists-openSUSE-KDE-cd 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: bundle-lang-common-en lzma pm-utils yast2-live-installer BuildRequires: bootsplash bootsplash-branding-openSUSE cromfs gfxboot-devel glib2-lang gnome-keyring-lang BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD BuildRequires: opensuse-kdequick_en-pdf yast2-firstboot @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 6 +Release: 8 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -56,7 +56,7 @@ Source14: config.oempartition Source16: boot.langset Source17: 99-ignore-live-usb.fdi -Source18: myoem.diff +Source18: kiwi-config.diff Source19: config-usb.patch Source20: geturls.xsl ExcludeArch: ia64 ppc64 s390x s390 ppc @@ -94,11 +94,14 @@ suseversion=11.1 %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem -patch myoem/config.xml %{SOURCE18} +cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso +patch -p0 < %{SOURCE18} # do not package it rm -f myoem/config.xml.orig +rm -f myiso/config.xml.orig install -m 644 %{SOURCE14} myoem/root/config.oempartition kiwi --createhash myoem +kiwi --createhash myiso sed -i -e 's,@CONFIG@,%{_builddir}/%{name}-%{version}/config,' config.xml sed -i -e "s,@VERSION@,$suseversion," config.xml mkdir config-cdroot @@ -145,7 +148,7 @@ 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 checkmedia yast2-firstboot; 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 kiwi-tools checkmedia yast2-firstboot; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -199,6 +202,8 @@ %changelog * Mon Aug 11 2008 coolo@suse.de +- don't use cracklib-dict-small +* Mon Aug 11 2008 coolo@suse.de - remove possible outcome of patch * Sat Aug 09 2008 coolo@suse.de - remove unneeded buildrequire ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-08-08 15:15:26.000000000 +0200 +++ kiwi-image-livecd-kde/config.xml.in 2008-08-11 12:55:54.111394000 +0200 @@ -6,12 +6,12 @@ <specification>openSUSE @VERSION@ Live system</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-@VERSION@" flags="unified">iso</type> + <type primary="true" boot="@CONFIG@/myiso" flags="unified">iso</type> <type boot="vmxboot/suse-@VERSION@" filesystem="ext3" format="vmdk">vmx</type> <type boot="xenboot/suse-@VERSION@" filesystem="ext3">xen</type> <!-- type boot="@CONFIG@/myoem" filesystem="squashfs" flags="unified">oem</type --> <type boot="@CONFIG@/myoem" filesystem="ext3">oem</type> - <version>2.7.0</version> + <version>2.7.0</version> <size unit="M">2780</size> <packagemanager>zypper</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> @@ -46,13 +46,4 @@ <package name="udev"/> <package name="bundle-lang-common-en"/> </packages> - <split> - <temporary> - <!-- allow read/write access to: --> - <file name="/var"/> - <file name="/var/*"/> - <file name="/etc"/> - <file name="/etc/*"/> - </temporary> - </split> </image> ++++++ kiwi-config.diff ++++++ --- suse-11.0/config.xml 2008-07-24 13:15:09.000000000 +0200 +++ myoem/config.xml 2008-08-07 11:22:06.000000000 +0200 @@ -50,6 +42,7 @@ <file name="drivers/parport/*"/> <file name="drivers/char/lp.ko"/> <file name="drivers/acpi/dock.ko"/> + <file name="drivers/usb/*"/> </drivers> <repository type="yast2" status="replaceable"> <source path="/image/CDs/full-11.0-i386"/> --- suse-11.0/config.xml 2008-07-24 11:15:39.000000000 +0000 +++ myiso/config.xml 2008-08-11 10:57:22.000000000 +0000 @@ -71,7 +71,6 @@ <packages type="bootstrap"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="cracklib-dict-small"/> <package name="psmisc"/> <package name="bind-libs"/> <package name="bind-utils"/> @@ -117,6 +116,7 @@ <package name="bootsplash-branding-openSUSE"/> <package name="cpio"/> <package name="cyrus-sasl"/> + <package name="cracklib-dict-full"/> <package name="db"/> <package name="dbus-1-glib"/> <package name="device-mapper"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org