Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Tue Jan 25 09:50:04 CET 2011. -------- --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2010-11-24 11:42:21.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2011-01-19 12:13:51.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Jan 19 11:13:15 UTC 2011 - coolo@novell.com + +- remove boot.braille (bnc#665367) +- do not hardcode /tmp directories for %build + +------------------------------------------------------------------- +Tue Jan 18 16:01:52 UTC 2011 - coolo@novell.com + +- tiwai says the code should be obsolete + +------------------------------------------------------------------- +Sat Jan 15 16:04:23 UTC 2011 - coolo@novell.com + +- remove pdfs for now + +------------------------------------------------------------------- +Fri Dec 17 11:27:11 UTC 2010 - coolo@novell.com + +- remove 140MB of akondi data after live installation + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- boot.braille ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.jVHbwo/_old 2011-01-25 09:49:15.000000000 +0100 +++ /var/tmp/diff_new_pack.jVHbwo/_new 2011-01-25 09:49:15.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kiwi-config-openSUSE (Version 11.4) +# spec file for package kiwi-config-openSUSE # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,12 @@ BuildRequires: fdupes kiwi-desc-isoboot package-lists-openSUSE-all BuildRequires: kiwi-desc-oemboot kiwi-desc-usbboot kiwi-doc kiwi-tools BuildRequires: licenses skelcd-control-openSUSE skelcd-openSUSE-CD -BuildRequires: libxslt opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf +BuildRequires: libxslt +#opensuse-gnomequick_en-pdf opensuse-kdequick_en-pdf BuildRequires: jing kiwi yast2-country Summary: KDE live CD Version: 11.4 -Release: 1 +Release: 2 Group: System/Boot License: BSD3c(or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,7 +44,6 @@ Source20: geturls.xsl Source22: getcountrydata.ycp Source23: langset.sh -Source24: boot.braille Source26: xdm-liveinstall.patch Source27: SoftLocks ExcludeArch: ia64 ppc64 s390x s390 ppc @@ -57,10 +57,9 @@ %build kiwiversion=11.4 BASEDIR=$PWD -rm -rf /tmp/locale-settings/ -mkdir /tmp/locale-settings/ -/usr/lib/YaST2/bin/y2base %{SOURCE22} UI -pushd /tmp/locale-settings/ +localedir=`mktemp -d` +OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI +pushd $localedir for i in *.UTF-8; do mv $i ${i/.UTF-8/} done @@ -148,9 +147,8 @@ touch etc/dmidecode.md5 fi install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 - cp -a /tmp/locale-settings/ etc/langset + cp -a $localedir etc/langset install -m 755 %{SOURCE23} etc/langset.sh - install -D -m 755 %{SOURCE24} etc/init.d/boot.braille install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot install -D -m 755 %{SOURCE12} usr/bin/correct_live_install @@ -158,6 +156,7 @@ install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch mkdir -p var/lib/zypp/ echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor +if false; then if test $type != usb; then if test $desktop = kde; then install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf var/lib/livecd/ @@ -165,6 +164,7 @@ install -m 644 /usr/share/doc/manual/opensuse-gnomequick_en-pdf/opensuse-gnomequick_en.pdf var/lib/livecd/ fi fi +fi arch=%{_target_cpu} plfile=/usr/share/suse/packages/$config-$arch if test -f $plfile; then ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.jVHbwo/_old 2011-01-25 09:49:15.000000000 +0100 +++ /var/tmp/diff_new_pack.jVHbwo/_new 2011-01-25 09:49:15.000000000 +0100 @@ -24,6 +24,7 @@ #-------------------------------------- echo "Configure image: [$name]..." +if test -n "$use_special_hacks"; then #====================================== # Load sound drivers by default #-------------------------------------- @@ -33,6 +34,7 @@ # and unmute their mixers. perl -pi -e 's,/sbin/alsactl -F restore,/bin/set_default_volume -f,;' \ /etc/udev/rules.d/40-alsa.rules +fi #-------------------------------------- # these two we want to disable for policy reasons @@ -40,7 +42,6 @@ chkconfig cron off # enable create_xconf -chkconfig boot.braille on chkconfig boot.langset on # disable for now chkconfig boot.compcache on chkconfig boot.ldconfig off ++++++ correct_live_for_reboot ++++++ --- /var/tmp/diff_new_pack.jVHbwo/_old 2011-01-25 09:49:15.000000000 +0100 +++ /var/tmp/diff_new_pack.jVHbwo/_new 2011-01-25 09:49:15.000000000 +0100 @@ -10,7 +10,6 @@ chkconfig sshd on chkconfig cron on -# TODO make this conditional chkconfig boot.braille off chkconfig boot.ldconfig on chkconfig boot.langset off if test -e /etc/init.d/boot.compcache; then @@ -21,5 +20,7 @@ # remove live-cd user userdel linux +# a lot of stuff! +rm -rf /home/linux/.local/share/akonadi mv /home/linux /home/linux~ ++++++ getcountrydata.ycp ++++++ --- /var/tmp/diff_new_pack.jVHbwo/_old 2011-01-25 09:49:15.000000000 +0100 +++ /var/tmp/diff_new_pack.jVHbwo/_new 2011-01-25 09:49:15.000000000 +0100 @@ -8,7 +8,7 @@ map consolefonts = (map)SCR::Read (.target.yast2, "consolefonts.ycp"); map timezonemap = Language::GetLang2TimezoneMap(true); - string dir = "/tmp/locale-settings/"; + string dir = getenv("OUTPUTDIR"); foreach (string lang, list ll, langs, { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org