Hello community, here is the log from the commit of package installation-images checked in at Fri Oct 19 17:16:17 CEST 2007. -------- --- installation-images/installation-images.changes 2007-09-27 15:14:05.000000000 +0200 +++ /mounts/work_users/ro/STABLE/installation-images/installation-images.changes 2007-10-19 17:13:46.295024000 +0200 @@ -1,0 +2,13 @@ +Fri Oct 19 17:13:13 CEST 2007 - ro@suse.de + +- added libaio for multipath +- added libpixman for Xorg +- added gtk2/glib2/cairo/librsvg for fvwm + +------------------------------------------------------------------- +Fri Oct 19 16:31:23 CEST 2007 - ro@suse.de + +- add master-switch in specfile to enable/disable xen images +- disable xen until we have kernel-xen again + +------------------------------------------------------------------- New: ---- installation-images-9.114.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.C12502/_old 2007-10-19 17:14:55.000000000 +0200 +++ /var/tmp/diff_new_pack.C12502/_new 2007-10-19 17:14:55.000000000 +0200 @@ -11,6 +11,7 @@ # needsrootforbuild Name: installation-images +%define build_xen 0 BuildRequires: IPAGothic KhmerOS-fonts adaptec-firmware ash autoyast2-installation baekmuk-ttf bc blueprint-cursor-theme bootsplash bootsplash-theme-SuSE bootsplash-theme-SuSE-SLES cifs-mount cron cups-libs ddrescue dhcpcd dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-arabic fonts-config fonts-thai freefont gdb glibc-i18ndata hex icmpinfo indic-fonts initviocons iputils joe kdelibs3 krb5-devel libidn libjpeg-devel libpng-devel links linuxrc lklug lvm2 mdadm mingetty mtools multipath-tools nasm netcat netpbm nfs-utils nscd ntfsprogs openslp-server openssh pcmciautils pcre-devel perl-Compress-Zlib popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen scsi setserial smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo ttf-founder-simplified usbutils wget xfsdump BuildRequires: e2fsprogs yast2-add-on yast2-mouse yast2-network yast2-ntp-client yast2-qt yast2-repair yast2-runlevel yast2-slp yast2-storage-evms yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool evms fvwm2 hfsutils kernel-binary-packages libelf0 libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite util-linux @@ -21,10 +22,18 @@ %ifarch %ix86 x86_64 BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode wireless-tools wpa_supplicant BuildRequires: adm8211-kmp-default at76_usb-kmp-default iwlwifi-kmp-default rt2x00-kmp-default wlan-ng-kmp-default +%if %{build_xen} BuildRequires: adm8211-kmp-xen at76_usb-kmp-xen iwlwifi-kmp-xen rt2x00-kmp-xen wlan-ng-kmp-xen +%else +#!BuildIgnore: kernel-xen +%endif %endif %ifarch %ix86 +%if %{build_xen} BuildRequires: adm8211-kmp-xenpae at76_usb-kmp-xenpae iwlwifi-kmp-xenpae rt2x00-kmp-xenpae wlan-ng-kmp-xenpae +%else +#!BuildIgnore: kernel-xenpae +%endif %endif BuildRequires: ltrace %ifnarch s390 s390x @@ -66,8 +75,9 @@ AutoReqProv: off Summary: Installation Image Files Version: 9.114 -Release: 1 +Release: 10 Source: installation-images-9.114.tar.bz2 +Patch: installation-images-9.114.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %define _binary_payload w.ufdio @@ -79,6 +89,7 @@ %prep %setup +%patch %build # files go to CD1/boot/$boot_arch/ @@ -123,6 +134,7 @@ %ifarch %ix86 x86_64 # cleanup from last theme rm -rf tmp/base +%if %{build_xen} # we need real xen initrd & kernel for flavor in xen xenpae ; do if rpm --quiet -q kernel-$flavor ; then @@ -135,9 +147,11 @@ rm -rf tmp/base fi done +%endif %else if [ "$theme" = "$firsttheme" ] ; then # save module config for specific kernels +%if %{build_xen} for flavor in xen xenpae ; do if rpm --quiet -q kernel-$flavor ; then kernel=kernel-$flavor kernel_img=System.map make initrd @@ -146,6 +160,7 @@ rm -rf tmp/base fi done +%endif fi %endif %ifarch %ix86 @@ -201,9 +216,11 @@ mkdir -p %{buildroot}/SuSE/$theme/CD1/boot if [ "$theme" = "$firsttheme" ] ; then mkdir -p %{buildroot}/SuSE/install-initrd +%if %{build_xen} for i in default xen xenpae ; do [ -d images/$i ] && cp -a images/$i %{buildroot}/SuSE/install-initrd done +%endif [ -f images/initrd-base.gz ] && cp images/initrd-base.gz %{buildroot}/SuSE/install-initrd fi %ifarch %ix86 @@ -220,6 +237,7 @@ mkdir -p %{buildroot}/SuSE/$theme/FTP/boot/$boot_arch cp -a images/floppy %{buildroot}/SuSE/$theme/FTP/boot/$boot_arch fi +%if %{build_xen} for flavor in xen xenpae ; do if [ -f images/initrd-$flavor-$theme ] ; then install -m 644 images/initrd-$flavor-$theme %{buildroot}/SuSE/$theme/CD1/boot/$boot_arch/initrd-$flavor @@ -227,6 +245,7 @@ fi done %endif +%endif %ifarch sparc mkdir -p %{buildroot}/SuSE/$theme/CD1/boot install -m 644 images/initrd %{buildroot}/SuSE/$theme/CD1/boot/initrd32 @@ -318,6 +337,13 @@ /SuSE /CD1 %changelog +* Fri Oct 19 2007 - ro@suse.de +- added libaio for multipath +- added libpixman for Xorg +- added gtk2/glib2/cairo/librsvg for fvwm +* Fri Oct 19 2007 - ro@suse.de +- add master-switch in specfile to enable/disable xen images +- disable xen until we have kernel-xen again * Thu Sep 27 2007 - snwint@suse.de - added intel xorg driver (#328042) * Tue Sep 25 2007 - snwint@suse.de ++++++ installation-images-9.114.dif ++++++ --- data/root/machbunt.file_list +++ data/root/machbunt.file_list @@ -155,6 +155,7 @@ /usr/lib*/libXxf86misc.so.* /usr/lib*/libXxf86vm.so.* /usr/lib*/libdmx.so.* + /usr/lib*/libpixman.so.* xorg-x11-libxcb: /usr/lib*/libxcb.so.* @@ -248,6 +249,18 @@ libstroke: /usr/lib*/libstroke.so* + cairo: + /usr/lib*/libcairo.so.* + + glib2: + /usr/lib*/libgmodule-2.0.so.* + + gtk2: + /usr/lib*/libgdk_pixbuf-2.0.so.* + + librsvg: + /usr/lib*/librsvg-2.so.* + endif if with_yast2 ne 'no' --- data/root/root.file_list +++ data/root/root.file_list @@ -875,6 +875,9 @@ multipath-tools: /sbin/multipath +libaio: + /lib*/libaio.so.* + kpartx: /etc/udev /lib/udev ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org