August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit installation-images
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package installation-images checked in at Wed Aug 13 17:05:58 CEST 2008. -------- --- installation-images/installation-images.changes 2008-07-29 21:16:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2008-08-13 16:26:03.000000000 +0200 @@ -1,0 +2,9 @@ +Wed Aug 13 16:28:49 CEST 2008 - adrian(a)suse.de + +- fix package build in openSUSE:Factory + -> firmware packages gets moved in + -> font packages are not needed anymore, since they get loaded + -> temporary disable virtualbox driver until virtualbox get fixed build + -> temporary disable wlan-ng and at76_usb until build fix (needs uname hack) + +------------------------------------------------------------------- Old: ---- needed_space_in_mb ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ installation-images.spec ++++++ --- /var/tmp/diff_new_pack.A18097/_old 2008-08-13 17:04:56.000000000 +0200 +++ /var/tmp/diff_new_pack.A18097/_new 2008-08-13 17:04:56.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package installation-images (Version 10.50) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,7 +20,7 @@ Name: installation-images %define build_xen 1 -BuildRequires: FZSongTi IPAGothic KhmerOS-fonts adaptec-firmware ash autoyast2-installation baekmuk-ttf bc blueprint-cursor-theme bootsplash bootsplash-branding-SLED bootsplash-branding-SLES bootsplash-branding-openSUSE cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 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 popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump +BuildRequires: adaptec-firmware ash autoyast2-installation bc blueprint-cursor-theme bootsplash cifs-mount cron cups-libs ddrescue dhcpcd dhcpv6 dmraid dump ed efont-unicode eject evms-gui fbiterm finger fonts-config 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 popt-devel pothana2000 qlogic-firmware recode rsh rsync sbl screen setserial sg3_utils smartmontools socat sysconfig syslogd tcpd-devel telnet telnet-server termcap terminfo usbutils wget xfsdump BuildRequires: e2fsprogs ncurses-utils yast2-add-on yast2-kdump yast2-mouse yast2-ncurses-pkg yast2-network yast2-ntp-client yast2-qt yast2-qt-pkg yast2-repair yast2-runlevel yast2-slp yast2-trans-allpacks yast2-trans-stats yast2-tune yast2-update yast2-users BuildRequires: aaa_base audit-libs boost busybox checkmedia cryptsetup dejavu dmapi dosfstools ethtool evms fvwm2 gpm hfsutils icewm-lite kernel-binary-packages libelf0 libzypp open-iscsi openct pciutils pcsc-lite perl-HTML-Parser resmgr sqlite3 util-linux BuildRequires: gpg2 jfsutils kexec-tools limal limal-perl perl-XML-Bare suse-build-key yast2-iscsi-client yast2-ncurses @@ -21,14 +28,16 @@ BuildRequires: bzip2 cracklib cracklib-dict-full curl libcap libexpat1 libfuse2 libreiserfs libreiserfs-devel lzma module-init-tools nfs-client ntfs-3g parted procinfo procps psmisc satsolver-tools squashfs strace unfonts vim xntp yast2-devtools BuildRequires: bind-libs bind-utils lsscsi sdparm smp_utils # kmps +BuildRequires: adaptec-firmware %ifarch %ix86 x86_64 BuildRequires: atmel-firmware ipw-firmware iwl3945-ucode iwl4965-ucode ralink-firmware wireless-tools wpa_supplicant -BuildRequires: at76_usb-kmp-default wlan-ng-kmp-default -%if %{build_xen} -BuildRequires: at76_usb-kmp-xen wlan-ng-kmp-xen -%else +# FIXME: This needs the uname hack. We are in good progress to open source this via the post build checks. +#BuildRequires: at76_usb-kmp-default wlan-ng-kmp-default +#%if %{build_xen} +#BuildRequires: at76_usb-kmp-xen wlan-ng-kmp-xen +#%else #!BuildIgnore: kernel-xen -%endif +#%endif %endif BuildRequires: ltrace %ifnarch s390 s390x @@ -38,8 +47,10 @@ BuildRequires: librtas lilo pdisk powerpc-utils BuildRequires: petitboot %endif +# FIXME: needs to be fixed with current gcc +# BuildRequires: xorg-x11-driver-virtualbox-ose %ifarch %ix86 x86_64 -BuildRequires: dhcp-client firmwarekit gfxboot-branding-openSUSE grub libsmbios2 libunwind lilo memtest86+ pmtools syslinux xorg-x11-driver-virtualbox-ose yast2-vm +BuildRequires: dhcp-client firmwarekit gfxboot-branding-openSUSE grub libsmbios2 libunwind lilo memtest86+ pmtools syslinux yast2-vm %endif %ifarch %ix86 BuildRequires: dos2unix ftp ncpfs tftp @@ -58,8 +69,11 @@ %endif %if %sles_version > 0 BuildRequires: desktop-data-NLD yast2-theme-NLD +BuildRequires: bootsplash-branding-SLED +BuildRequires: bootsplash-branding-SLES %else BuildRequires: desktop-data-SuSE yast2-theme-openSUSE +BuildRequires: bootsplash-branding-openSUSE %endif # %ifnarch s390 @@ -125,7 +139,7 @@ AutoReqProv: off Summary: Installation Image Files Version: 10.50 -Release: 8 +Release: 22 Source: installation-images-10.50.tar.bz2 Patch: installation-images-10.50.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -414,6 +428,12 @@ /CD1 %changelog +* Wed Aug 13 2008 adrian(a)suse.de +- fix package build in openSUSE:Factory + -> firmware packages gets moved in + -> font packages are not needed anymore, since they get loaded + -> temporary disable virtualbox driver until virtualbox get fixed build + -> temporary disable wlan-ng and at76_usb until build fix (needs uname hack) * Tue Jul 29 2008 coolo(a)suse.de - libzypp needs more of boost now * Tue Jul 29 2008 ro(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package yast2-printer checked in at Wed Aug 13 15:11:00 CEST 2008. -------- --- yast2-printer/yast2-printer.changes 2008-08-11 14:15:35.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-printer/yast2-printer.changes 2008-08-12 10:32:56.216715000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 12 10:31:20 CEST 2008 - mzugec(a)suse.cz + +- removed cups-devel from Requires + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.e14034/_old 2008-08-13 15:10:38.000000000 +0200 +++ /var/tmp/diff_new_pack.e14034/_new 2008-08-13 15:10:38.000000000 +0200 @@ -21,7 +21,7 @@ Name: yast2-printer Version: 2.17.2 -Release: 1 +Release: 3 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -29,7 +29,7 @@ Prefix: /usr BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Recommends: netcat -Requires: /usr/bin/host cups-libs cups-devel +Requires: /usr/bin/host cups-libs Requires: yast2 >= 2.16.12 #Requires: cups >= 1.2 Provides: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel @@ -117,6 +117,8 @@ %exclude %{prefix}/share/doc/packages/yast2-printer/COPYING %exclude %{prefix}/share/doc/packages/yast2-printer/README %changelog +* Tue Aug 12 2008 mzugec(a)suse.cz +- removed cups-devel from Requires * Mon Aug 11 2008 mzugec(a)suse.cz - major code changes based on Johannes Meixner's code - 2.17.2 ++++++ yast2-printer-2.17.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.2/configure new/yast2-printer-2.17.2/configure --- old/yast2-printer-2.17.2/configure 2008-08-11 14:08:24.000000000 +0200 +++ new/yast2-printer-2.17.2/configure 2008-08-12 10:29:37.000000000 +0200 @@ -2411,7 +2411,7 @@ VERSION="2.17.2" RPMNAME="yast2-printer" -MAINTAINER="Johannes Meixner <jsmeix(a)suse.de>" +MAINTAINER="Michal Zugec <mzugec(a)novell.com>" pkgconfigdir=\${libdir}/pkgconfig pkgconfigdatadir=\${datadir}/pkgconfig diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.2/configure.in new/yast2-printer-2.17.2/configure.in --- old/yast2-printer-2.17.2/configure.in 2008-08-11 14:08:19.000000000 +0200 +++ new/yast2-printer-2.17.2/configure.in 2008-08-12 10:29:31.000000000 +0200 @@ -20,7 +20,7 @@ dnl Important YaST2 variables VERSION="2.17.2" RPMNAME="yast2-printer" -MAINTAINER="Johannes Meixner <jsmeix(a)suse.de>" +MAINTAINER="Michal Zugec <mzugec(a)novell.com>" dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-printer-2.17.2/MAINTAINER new/yast2-printer-2.17.2/MAINTAINER --- old/yast2-printer-2.17.2/MAINTAINER 2008-08-11 13:09:24.000000000 +0200 +++ new/yast2-printer-2.17.2/MAINTAINER 2008-08-11 15:16:27.000000000 +0200 @@ -1 +1 @@ -Johannes Meixner <jsmeix(a)suse.de> +Michal Zugec <mzugec(a)novell.com> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit cimple
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package cimple checked in at Wed Aug 13 15:10:40 CEST 2008. -------- --- cimple/cimple.changes 2008-08-04 00:23:36.000000000 +0200 +++ /mounts/work_users/ro/STABLE/cimple/cimple.changes 2008-08-13 15:10:09.778278000 +0200 @@ -1,0 +2,5 @@ +Wed Aug 13 15:09:52 CEST 2008 - ro(a)suse.de + +- devel: change require from pegasus-devel to tog-pegasus-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cimple.spec ++++++ --- /var/tmp/diff_new_pack.C12570/_old 2008-08-13 15:10:26.000000000 +0200 +++ /var/tmp/diff_new_pack.C12570/_new 2008-08-13 15:10:26.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package cimple (Version 0.99.56) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,7 +25,7 @@ Group: System/Management AutoReqProv: on Version: 0.99.56 -Release: 117 +Release: 125 Summary: CIMPLE is an embeddable CIM provider engine Url: http://cimple.org Source0: %{name}-%{version}.tar.gz @@ -80,7 +87,7 @@ Group: System/Management Requires: %{name} = %{version}-%{release} Requires: %{name}-pegasus-adapter = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} pegasus-devel +Requires: %{name}-devel = %{version}-%{release} tog-pegasus-devel %description pegasus-devel The Pegasus Adapter for CIMPLE is a bridge between the native Pegasus @@ -153,6 +160,8 @@ %{_includedir}/%{name}/Pegasus_Adapter.h %changelog +* Wed Aug 13 2008 ro(a)suse.de +- devel: change require from pegasus-devel to tog-pegasus-devel * Mon Aug 04 2008 ro(a)suse.de - build with pegasus since openwbem is dropped * Wed Mar 28 2007 bwhiteley(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit package-lists-openSUSE
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package package-lists-openSUSE checked in at Wed Aug 13 15:10:28 CEST 2008. -------- --- AUTO/all/package-lists-openSUSE/package-lists-openSUSE.changes 2008-08-11 16:57:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/package-lists-openSUSE/package-lists-openSUSE.changes 2008-08-12 09:10:53.967904000 +0200 @@ -1,0 +2,5 @@ +Tue Aug 12 09:10:39 CEST 2008 - coolo(a)suse.de + +- also require the packages needed for initrd creation of kiwi + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ package-lists-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.Y11516/_old 2008-08-13 15:10:19.000000000 +0200 +++ /var/tmp/diff_new_pack.Y11516/_new 2008-08-13 15:10:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package package-lists-openSUSE (Version 11.0) +# spec file for package package-lists-openSUSE (Version 11.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,8 +23,8 @@ Group: Metapackages AutoReqProv: on Summary: Patterns for Installation (full ftp tree) -Version: 11.0 -Release: 114 +Version: 11.1 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build # ~coolo/Export/Paketlisten/filelists.tar.bz2 Source: filelists.tar.bz2 @@ -32,6 +32,7 @@ Source2: package-lists-openSUSE-rpmlintrc %define __find_requires perl %{S:1} %define _use_internal_dependency_generator 0 +ExclusiveArch: %ix86 x86_64 ppc %description This is an internal package that is used to create the patterns as part @@ -112,6 +113,7 @@ %dir /usr/share/suse %dir /usr/share/suse/packages /usr/share/suse/packages/gnome_cd.*.list +/usr/share/suse/packages/x11_cd-initrd.*.list %exclude /usr/share/suse/packages/*-default*.list %files KDE-cd @@ -119,6 +121,7 @@ %dir /usr/share/suse %dir /usr/share/suse/packages /usr/share/suse/packages/kde_cd.*.list +/usr/share/suse/packages/x11_cd-initrd.*.list %exclude /usr/share/suse/packages/*-default*.list %files X11-cd @@ -126,6 +129,7 @@ %dir /usr/share/suse %dir /usr/share/suse/packages /usr/share/suse/packages/x11_cd.*.list +/usr/share/suse/packages/x11_cd-initrd.*.list %exclude /usr/share/suse/packages/*-default*.list %files images @@ -136,6 +140,8 @@ %exclude /usr/share/suse/packages/kde4_*list %changelog +* Tue Aug 12 2008 coolo(a)suse.de +- also require the packages needed for initrd creation of kiwi * Mon Aug 11 2008 coolo(a)suse.de - adding a X11-cd for minimal testing * Thu Jul 31 2008 coolo(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi-image-livecd-kde
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package kiwi-image-livecd-kde checked in at Wed Aug 13 15:09:21 CEST 2008. -------- --- arch/i686/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-11 22:57:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/kiwi-image-livecd-gnome.changes 2008-08-13 15:08:41.102308000 +0200 @@ -1,0 +2,7 @@ +Wed Aug 13 09:08:48 CEST 2008 - coolo(a)suse.de + +- make the usb image work with factory (kiwi patch) +- make the repos work +- support minimal X11 + +------------------------------------------------------------------- kiwi-image-livecd-kde.changes: same change New: ---- initrd-11.0.list ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-image-livecd-gnome.spec ++++++ --- /var/tmp/diff_new_pack.Zd8791/_old 2008-08-13 15:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Zd8791/_new 2008-08-13 15:09:13.000000000 +0200 @@ -25,7 +25,7 @@ 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 +BuildRequires: libxslt opensuse-gnomequick_en-pdf yast2-firstboot # 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 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: GNOME Live CD Version: 11.1 -Release: 8 +Release: 9 Group: Productivity/Other License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +59,7 @@ Source18: kiwi-config.diff Source19: config-usb.patch Source20: geturls.xsl +Source21: initrd-11.0.list ExcludeArch: ia64 ppc64 s390x s390 ppc %define build_usb 1 # do not compress the ISO - takes ages @@ -94,8 +95,8 @@ suseversion=11.1 %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem -cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso -patch -p0 < %{SOURCE18} +cp -rL /usr/share/kiwi/image/isoboot/suse-$suseversion myiso +patch -l -p0 < %{SOURCE18} # do not package it rm -f myoem/config.xml.orig rm -f myiso/config.xml.orig @@ -118,7 +119,7 @@ mkdir rpmkeys cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml -install -m 644 %{SOURCE20} tmp/geturls.xsl +/usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > tmp/geturls.sh install -m 644 %{SOURCE5} tmp/config.patch mkdir -p etc/zypp/products.d echo "[openSUSE $suseversion %arch]" > etc/zypp/products.d/openSUSE-release.prod @@ -148,7 +149,11 @@ 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 kiwi-tools checkmedia yast2-firstboot; do +sourcelist=%{SOURCE21} +%if %suse_version > 1100 +sourcelist=/usr/share/suse/packages/x11_cd-initrd.*.list +%endif +for i in `cat wanted.list $sourcelist | sort -u`; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -189,7 +194,7 @@ mv $file %{buildroot}/usr/share/kiwi/output/%name-$file %else file=`ls -1 *.raw` -bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +gzip -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.gz %endif %files @@ -197,10 +202,15 @@ /usr/share/kiwi %files -n kiwi-config-openSUSE-gnome +%defattr(-, root, root) %doc %_docdir/kiwi-config-openSUSE-gnome /usr/share/openSUSE %changelog +* Wed Aug 13 2008 coolo(a)suse.de +- make the usb image work with factory (kiwi patch) +- make the repos work +- support minimal X11 * Mon Aug 11 2008 coolo(a)suse.de - don't use cracklib-dict-small * Mon Aug 11 2008 coolo(a)suse.de ++++++ kiwi-image-livecd-kde.spec ++++++ --- /var/tmp/diff_new_pack.Zd8791/_old 2008-08-13 15:09:13.000000000 +0200 +++ /var/tmp/diff_new_pack.Zd8791/_new 2008-08-13 15:09:13.000000000 +0200 @@ -25,7 +25,7 @@ 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 +BuildRequires: libxslt opensuse-kdequick_en-pdf yast2-firstboot # 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 @@ -36,7 +36,7 @@ BuildRequires: ghostscript-fonts-std ghostscript-library Summary: KDE live CD Version: 11.1 -Release: 8 +Release: 9 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +59,7 @@ Source18: kiwi-config.diff Source19: config-usb.patch Source20: geturls.xsl +Source21: initrd-11.0.list ExcludeArch: ia64 ppc64 s390x s390 ppc %define build_usb 1 # do not compress the ISO - takes ages @@ -94,8 +95,8 @@ suseversion=11.1 %endif cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myoem -cp -rL /usr/share/kiwi/image/oemboot/suse-$suseversion myiso -patch -p0 < %{SOURCE18} +cp -rL /usr/share/kiwi/image/isoboot/suse-$suseversion myiso +patch -l -p0 < %{SOURCE18} # do not package it rm -f myoem/config.xml.orig rm -f myiso/config.xml.orig @@ -118,7 +119,7 @@ mkdir rpmkeys cp /CD1/gpg-pubkey* rpmkeys install -m 644 -D /CD1/control.xml etc/YaST2/control.xml -install -m 644 %{SOURCE20} tmp/geturls.xsl +/usr/bin/xsltproc %{SOURCE20} /CD1/control.xml > tmp/geturls.sh install -m 644 %{SOURCE5} tmp/config.patch mkdir -p etc/zypp/products.d echo "[openSUSE $suseversion %arch]" > etc/zypp/products.d/openSUSE-release.prod @@ -148,7 +149,11 @@ 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 kiwi-tools checkmedia yast2-firstboot; do +sourcelist=%{SOURCE21} +%if %suse_version > 1100 +sourcelist=/usr/share/suse/packages/x11_cd-initrd.*.list +%endif +for i in `cat wanted.list $sourcelist | sort -u`; do cp -a /.rpm-cache/$BUILD_BASENAME/$i.rpm /home/rpmdir/rpms done createrepo /home/rpmdir @@ -189,7 +194,7 @@ mv $file %{buildroot}/usr/share/kiwi/output/%name-$file %else file=`ls -1 *.raw` -bzip2 -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.bz2 +gzip -c $file > %{buildroot}/usr/share/kiwi/output/%name-$file.gz %endif %files @@ -197,10 +202,15 @@ /usr/share/kiwi %files -n kiwi-config-openSUSE-kde +%defattr(-, root, root) %doc %_docdir/kiwi-config-openSUSE-kde /usr/share/openSUSE %changelog +* Wed Aug 13 2008 coolo(a)suse.de +- make the usb image work with factory (kiwi patch) +- make the repos work +- support minimal X11 * Mon Aug 11 2008 coolo(a)suse.de - don't use cracklib-dict-small * Mon Aug 11 2008 coolo(a)suse.de ++++++ config.sh ++++++ --- arch/i686/kiwi-image-livecd-kde/config.sh 2008-08-08 14:46:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.sh 2008-08-12 17:51:31.592641000 +0200 @@ -14,6 +14,8 @@ test -f /.kconfig && . /.kconfig test -f /.profile && . /.profile +set -e + exec > /var/log/config.log exec 2>&1 @@ -55,12 +57,12 @@ rmdir /rpmkeys insserv -insserv -r boot.apparmor +insserv -r boot.apparmor || true rm -rf /var/cache/zypp/raw/* -xsltproc /tmp/geturls.xsl /etc/YaST2/control.xml | bash -x -rm /tmp/geturls.xsl +bash -x /tmp/geturls.sh +rm /tmp/geturls.sh #====================================== # /etc/sudoers hack to fix #297695 @@ -90,9 +92,10 @@ test -x /usr/bin/kbuildsycoca4 && su - linux -c /usr/bin/kbuildsycoca4 +set +e #====================================== # Umount kernel filesystems #-------------------------------------- baseCleanMount - exit 0 + ++++++ config.xml.in ++++++ --- arch/i686/kiwi-image-livecd-kde/config.xml.in 2008-08-11 12:55:54.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/config.xml.in 2008-08-12 11:31:47.311030000 +0200 @@ -12,7 +12,7 @@  <type boot="@CONFIG@/myoem" filesystem="ext3">oem</type> <version>2.7.0</version> - <size unit="M">2780</size> + <size unit="M">1999</size> <packagemanager>zypper</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> <rpm-force>False</rpm-force> ++++++ geturls.xsl ++++++ --- arch/i686/kiwi-image-livecd-kde/geturls.xsl 2008-08-08 14:43:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-image-livecd-kde/geturls.xsl 2008-08-12 17:42:15.401398000 +0200 @@ -4,9 +4,9 @@ <xsl:template match="/"> <xsl:for-each select="y:productDefines/y:software/y:extra_urls/y:extra_url[y:enabled='true']"> <xsl:text>zypper addrepo -d </xsl:text> - <xsl:text> -n </xsl:text><xsl:value-of select="y:name"/> - <xsl:text> </xsl:text><xsl:value-of select="y:alias"/> + <xsl:text> -n "</xsl:text><xsl:value-of select="y:name"/><xsl:text>"</xsl:text> <xsl:text> </xsl:text><xsl:value-of select="y:baseurl"/> + <xsl:text> </xsl:text><xsl:value-of select="y:alias"/> <xsl:text> </xsl:text> </xsl:for-each> ++++++ kiwi-config.diff ++++++ --- /var/tmp/diff_new_pack.Zd8791/_old 2008-08-13 15:09:14.000000000 +0200 +++ /var/tmp/diff_new_pack.Zd8791/_new 2008-08-13 15:09:14.000000000 +0200 @@ -1,28 +1,57 @@ ---- 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"/> + <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="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"/> + <package name="db"/> + <package name="dbus-1-glib"/> + <package name="device-mapper"/> +--- suse-11.1/config.xml 2008-07-24 11:15:14.000000000 +0000 ++++ myoem/config.xml 2008-08-12 15:11:31.000000000 +0000 +@@ -50,6 +50,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-i386"/> +@@ -102,7 +103,7 @@ + <package name="glibc-locale"/> + <package name="diffutils"/> + <package name="procps"/> +- <package name="cracklib-dict-small"/> ++ <package name="cracklib-dict-full"/> + </packages> + <packages type="delete"> + <package name="PolicyKit"/> +@@ -151,5 +152,6 @@ + <package name="fribidi"/> + <package name="make"/> + <package name="bootsplash-branding-openSUSE"/> ++ <package name="cracklib-dict-full"/> + </packages> + </image> +--- suse-11.1/root/preinit 2008-07-24 11:15:16.000000000 +0000 ++++ myoem/root/preinit 2008-08-12 15:12:05.000000000 +0000 +@@ -49,7 +49,9 @@ + #====================================== + # use distro initrd via mkinitrd + #-------------------------------------- ++ udevStart + setupSUSEInitrd ++ udevKill + else + #====================================== + # use kiwi initrd from RW partition + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package kdebase4-runtime checked in at Wed Aug 13 15:08:24 CEST 2008. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-07-28 23:24:36.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2008-08-13 11:49:32.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 13 11:46:57 CEST 2008 - coolo(a)suse.de + +- exclude digikam icons to avoid file conflicts + +------------------------------------------------------------------- +Thu Jul 31 22:38:12 CEST 2008 - dmueller(a)suse.de + +- branch diff update + +------------------------------------------------------------------- oxygen-icon-theme.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.kN4446/_old 2008-08-13 15:07:45.000000000 +0200 +++ /var/tmp/diff_new_pack.kN4446/_new 2008-08-13 15:07:45.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kdebase4-runtime (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -23,7 +30,7 @@ Summary: The KDE Runtime Components Url: http://www.kde.org/ Version: 4.1.0 -Release: 1 +Release: 12 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu @@ -37,10 +44,9 @@ Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) Requires: kdelibs4 >= %version Requires: phonon -# don't make it a requirement -#Requires: xine-lib >= 1.1.9 Provides: suse_help_viewer Recommends: ispell, enscript +%define debug_package_requires %name = %version kdelibs3-debuginfo %description This package contains all run-time dependencies of KDE applications. @@ -359,6 +365,10 @@ %_kde4_modules/kcm_phononxine.so %changelog +* Wed Aug 13 2008 coolo(a)suse.de +- exclude digikam icons to avoid file conflicts +* Fri Aug 01 2008 dmueller(a)suse.de +- branch diff update * Fri Jul 25 2008 dmueller(a)suse.de - update to 4.1.0 - fix phonon-backend version ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.kN4446/_old 2008-08-13 15:07:45.000000000 +0200 +++ /var/tmp/diff_new_pack.kN4446/_new 2008-08-13 15:07:45.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package oxygen-icon-theme (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +27,7 @@ Summary: Oxygen Icon Theme Url: http://www.kde.org Version: 4.1.0 -Release: 1 +Release: 12 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable Source0: kdebase-runtime-%version.tar.bz2 @@ -103,10 +110,12 @@ %files scalable %defattr(-,root,root) /usr/share/icons/oxygen/scalable +%exclude /usr/share/icons/oxygen/scalable/apps/digikam.* %files %defattr(-,root,root) %exclude /usr/share/icons/oxygen/scalable/*/* +%exclude /usr/share/icons/oxygen/*/apps/digikam.png %dir /usr/share/icons/oxygen/scalable/actions %dir /usr/share/icons/oxygen/scalable/apps %dir /usr/share/icons/oxygen/scalable/devices @@ -117,6 +126,10 @@ /usr/share/icons/oxygen %changelog +* Wed Aug 13 2008 coolo(a)suse.de +- exclude digikam icons to avoid file conflicts +* Fri Aug 01 2008 dmueller(a)suse.de +- branch diff update * Fri Jul 25 2008 dmueller(a)suse.de - update to 4.1.0 - fix phonon-backend version ++++++ 4_1_BRANCH.diff ++++++ ++++ 1214 lines (skipped) ++++ between KDE/kdebase4-runtime/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-runtime/4_1_BRANCH.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kde4-plasma-addons
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package kde4-plasma-addons checked in at Wed Aug 13 15:07:32 CEST 2008. -------- --- KDE/kde4-plasma-addons/kde4-plasma-addons.changes 2008-07-28 13:44:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/kde4-plasma-addons/kde4-plasma-addons.changes 2008-08-13 11:41:51.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 13 09:14:55 CEST 2008 - coolo(a)suse.de + +- replace the released version of Aya with the one from SVN + +------------------------------------------------------------------- +Thu Jul 31 22:43:27 CEST 2008 - dmueller(a)suse.de + +- branch diff update + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.sv3062/_old 2008-08-13 15:06:46.000000000 +0200 +++ /var/tmp/diff_new_pack.sv3062/_new 2008-08-13 15:06:46.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package kde4-plasma-addons (Version 4.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -23,7 +30,7 @@ Summary: Additional Plasmoids Url: http://www.kde.org/ Version: 4.1.0 -Release: 1 +Release: 15 Source0: kdeplasma-addons-%{version}.tar.bz2 Patch0: 4_1_BRANCH.diff Provides: extragear-plasma = 4.0.80 @@ -44,6 +51,20 @@ -------- The KDE Team +%package -n plasma-theme-aya +License: GPL v2 only +Group: System/GUI/KDE +Summary: Theme for Plasma + +%description -n plasma-theme-aya +This package contains the Plasma theme Aya. + + + +Authors: +-------- + The KDE Team <kde(a)kde.org> + %prep %setup -q -n kdeplasma-addons-%{version} %patch @@ -67,6 +88,10 @@ %clean rm -rf $RPM_BUILD_ROOT +%files -n plasma-theme-aya +%defattr(-,root,root) +/usr/share/kde4/apps/desktoptheme/Aya + %files %defattr(-,root,root) %doc COPYING @@ -82,8 +107,13 @@ /usr/%_lib/kde4/krunner_contacts.so /usr/%_lib/kde4/krunner_converterrunner.so /usr/share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz +%exclude /usr/share/kde4/apps/desktoptheme/Aya %changelog +* Wed Aug 13 2008 coolo(a)suse.de +- replace the released version of Aya with the one from SVN +* Fri Aug 01 2008 dmueller(a)suse.de +- branch diff update * Mon Jul 28 2008 dmueller(a)suse.de - update to 4.1.0 * Sat Jul 12 2008 dmueller(a)suse.de ++++++ 4_1_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.sv3062/_old 2008-08-13 15:06:46.000000000 +0200 +++ /var/tmp/diff_new_pack.sv3062/_new 2008-08-13 15:06:46.000000000 +0200 @@ -1,7 +1,23 @@ -package: kdeplasmoids-4.0.84.tar.bz2 -kdemod: kdeplasmoids +package: kdeplasma-addons-4.1.0.tar.bz2 +kdemod: kdeplasma-addons --- BRANCH_STATUS +++ BRANCH_STATUS @@ -0,0 +1,2 @@ -+current HEAD: 827474 -+svn di between //trunk/KDE/kdeplasmoids@827473 and //trunk/KDE/kdeplasmoids ++current HEAD: 840292 ++svn di between //tags/KDE/4.1.0/kdeplasma-addons and //branches/KDE/4.1/kdeplasma-addons +--- dataengines/twitter/twitterengine.cpp ++++ dataengines/twitter/twitterengine.cpp +@@ -52,6 +52,8 @@ + + TwitterEngine::~TwitterEngine() + { ++ delete m_anonHttp; ++ delete m_http; + } + + void TwitterEngine::setStatus(const QString &status) + +Property changes on: . +___________________________________________________________________ +Deleted: svn:mergeinfo + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pulseaudio
by root＠Hilbert.suse.de 13 Aug '08

13 Aug '08

Hello community, here is the log from the commit of package pulseaudio checked in at Wed Aug 13 15:06:36 CEST 2008. -------- --- pulseaudio/pulseaudio.changes 2008-07-18 22:38:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/pulseaudio/pulseaudio.changes 2008-08-11 12:38:36.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 11 12:44:56 CEST 2009 - rodrigo(a)suse.de + +- Change Obsoletes and Provides from esound to esound-daemon, which + is the new package containing the Esound daemon + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseaudio.spec ++++++ --- /var/tmp/diff_new_pack.q31548/_old 2008-08-13 15:05:15.000000000 +0200 +++ /var/tmp/diff_new_pack.q31548/_new 2008-08-13 15:05:15.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package pulseaudio (Version 0.9.11) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -15,7 +22,7 @@ %define drvver 0.9 Summary: A Networked Sound Server Version: 0.9.11 -Release: 1 +Release: 20 License: GPL v2 or later; LGPL v2.1 or later Group: System/Sound Daemons Source: %{name}-%{version}.tar.bz2 @@ -48,8 +55,8 @@ Summary: ESOUND compatibility for PulseAudio Group: System/Sound Daemons Requires: %{name} = %{version} -Provides: esound = 0.2.38 -Obsoletes: esound <= 0.2.38 +Provides: esound-daemon = 0.2.38 +Obsoletes: esound-daemon <= 0.2.38 %description esound-compat pulseaudio is a networked sound server for Linux and other Unix like @@ -533,6 +540,9 @@ %{_mandir}/man1/pax11publish.1.gz %changelog +* Tue Aug 11 2009 rodrigo(a)suse.de +- Change Obsoletes and Provides from esound to esound-daemon, which + is the new package containing the Esound daemon * Wed Jul 16 2008 rodrigo(a)suse.de - Update to 0.9.11-RC version: + Much better sound latency implementation (glitch-free) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-product-creator
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package yast2-product-creator checked in at Tue Aug 12 00:35:41 CEST 2008. -------- --- yast2-product-creator/yast2-product-creator.changes 2008-08-01 15:43:57.000000000 +0200 +++ yast2-product-creator/yast2-product-creator.changes 2008-08-11 12:11:28.668504000 +0200 @@ -1,0 +2,8 @@ +Mon Aug 11 11:57:43 CEST 2008 - lslezak(a)suse.cz + +- added cross-architecture support (e.g. create a PPC installation + iso image on an i386 machine, but does not work in the kiwi part) + (fate#301883) +- 2.17.6 + +------------------------------------------------------------------- Old: ---- yast2-product-creator-2.17.5.tar.bz2 New: ---- yast2-product-creator-2.17.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-product-creator.spec ++++++ --- /var/tmp/diff_new_pack.J12263/_old 2008-08-12 00:35:05.000000000 +0200 +++ /var/tmp/diff_new_pack.J12263/_new 2008-08-12 00:35:05.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-product-creator (Version 2.17.5) +# spec file for package yast2-product-creator (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2-product-creator -Version: 2.17.5 +Version: 2.17.6 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-product-creator-2.17.5.tar.bz2 +Source0: yast2-product-creator-2.17.6.tar.bz2 Prefix: /usr BuildRequires: autoyast2-installation perl-XML-Writer update-desktop-files yast2 yast2-add-on-creator yast2-devtools yast2-packager yast2-security yast2-testsuite PreReq: %fillup_prereq @@ -28,6 +35,8 @@ Requires: yast2-packager >= 2.16.20 # changes in ag_anyxml agent Requires: yast2 >= 2.17.8 +# Pkg::SourceForceRefreshNow() +Requires: yast2-pkg-bindings >= 2.17.6 # New API of StorageDevices.ycp Conflicts: yast2-storage < 2.16.1 BuildArch: noarch @@ -40,7 +49,7 @@ %prep -%setup -n yast2-product-creator-2.17.5 +%setup -n yast2-product-creator-2.17.6 %build %{prefix}/bin/y2tool y2autoconf @@ -86,6 +95,11 @@ /usr/share/YaST2/scrconf/*.scr /var/adm/fillup-templates/sysconfig.product-creator %changelog +* Mon Aug 11 2008 lslezak(a)suse.cz +- added cross-architecture support (e.g. create a PPC installation + iso image on an i386 machine, but does not work in the kiwi part) + (fate#301883) +- 2.17.6 * Fri Aug 01 2008 jsuchome(a)suse.cz - Image Creator: added GUI to configure image compression - 2.17.5 ++++++ yast2-product-creator-2.17.5.tar.bz2 -> yast2-product-creator-2.17.6.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/configure new/yast2-product-creator-2.17.6/configure --- old/yast2-product-creator-2.17.5/configure 2008-06-16 14:20:27.000000000 +0200 +++ new/yast2-product-creator-2.17.6/configure 2008-08-11 12:08:39.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.17.0. +# Generated by GNU Autoconf 2.61 for yast2-product-creator 2.17.6. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2-product-creator' PACKAGE_TARNAME='yast2-product-creator' -PACKAGE_VERSION='2.17.0' -PACKAGE_STRING='yast2-product-creator 2.17.0' +PACKAGE_VERSION='2.17.6' +PACKAGE_STRING='yast2-product-creator 2.17.6' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1197,7 +1197,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-product-creator 2.17.0 to adapt to many kinds of systems. +\`configure' configures yast2-product-creator 2.17.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1268,7 +1268,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-product-creator 2.17.0:";; + short | recursive ) echo "Configuration of yast2-product-creator 2.17.6:";; esac cat <<\_ACEOF @@ -1346,7 +1346,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-product-creator configure 2.17.0 +yast2-product-creator configure 2.17.6 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1360,7 +1360,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-product-creator $as_me 2.17.0, which was +It was created by yast2-product-creator $as_me 2.17.6, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2181,7 +2181,7 @@ # Define the identity of the package. PACKAGE='yast2-product-creator' - VERSION='2.17.0' + VERSION='2.17.6' cat >>confdefs.h <<_ACEOF @@ -2409,7 +2409,7 @@ -VERSION="2.17.0" +VERSION="2.17.6" RPMNAME="yast2-product-creator" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3304,7 +3304,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-product-creator $as_me 2.17.0, which was +This file was extended by yast2-product-creator $as_me 2.17.6, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3347,7 +3347,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-product-creator config.status 2.17.0 +yast2-product-creator config.status 2.17.6 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/configure.in new/yast2-product-creator-2.17.6/configure.in --- old/yast2-product-creator-2.17.5/configure.in 2008-06-16 14:20:23.000000000 +0200 +++ new/yast2-product-creator-2.17.6/configure.in 2008-08-11 12:08:34.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-product-creator dnl -dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.3 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-product-creator, 2.17.0, http://bugs.opensuse.org/, yast2-product-creator) +AC_INIT(yast2-product-creator, 2.17.6, http://bugs.opensuse.org/, yast2-product-creator) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.0" +VERSION="2.17.6" RPMNAME="yast2-product-creator" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/src/complex.ycp new/yast2-product-creator-2.17.6/src/complex.ycp --- old/yast2-product-creator-2.17.5/src/complex.ycp 2008-07-24 14:02:48.000000000 +0200 +++ new/yast2-product-creator-2.17.6/src/complex.ycp 2008-08-11 12:02:47.000000000 +0200 @@ -4,14 +4,13 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: complex.ycp 49386 2008-07-24 11:04:45Z jsuchome $ + * $Id: complex.ycp 49917 2008-08-11 10:02:47Z lslezak $ */ { textdomain "product-creator"; - import "Arch"; import "CommandLine"; import "Directory"; import "FileUtils"; @@ -61,6 +60,27 @@ boolean first_start = true; + // check if the selected configuration has the same target architecture as the machine architecture + // needed for creating kiwi images because kiwi cannot create cross-architecture images + boolean SameArchitecture() + { + string arch = ProductCreator::Config["arch"]:""; + string sysarch = Arch::architecture(); + + // is the target architecture different than the machine architecture? + if (arch != nil && arch != "" && arch != sysarch) + { + // error message: %1 and %2 are architecture names like i386, x86_64, ppc... + Report::Error(sformat(_("Target architecture of the current configuration (%1) +does not match the system architecture (%2). + +Kiwi cannot create images for different architectures."), arch, sysarch)); + return false; + } + + return true; + } + /** * Overview dialog * @return dialog result @@ -122,6 +142,8 @@ any ret = nil; while(true) { + // reset the current architecture (needed when going back) + ProductCreator::ResetArch(); ret = UI::UserInput(); @@ -174,6 +196,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-isoboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "iso"; ret = `kiwi; break; @@ -182,6 +206,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-xenboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "xen"; ret = `kiwi; break; @@ -190,6 +216,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-usbboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "usb"; ret = `kiwi; break; @@ -198,6 +226,8 @@ Package::InstallAll (["kiwi", "kiwi-desc-vmxboot"])) { string current = (string) UI::QueryWidget(`id(`table), `CurrentItem); ProductCreator::Config = ProductCreator::Configs[current]:$[]; + // check the architecture + if (!SameArchitecture()) continue; Kiwi::kiwi_task = "vmx"; ret = `kiwi; break; @@ -209,6 +239,10 @@ y2error("unexpected retcode: %1", ret); continue; } + + if (ret == `kiwi) + { + } } return (symbol)ret; @@ -303,7 +337,7 @@ y2debug("bootconfig available"); string fname = (ProductCreator::Config["code10"]:false) - ? sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, Arch::architecture()) + ? sformat("%1/boot/%2/loader/isolinux.cfg", ProductCreator::skel_root, ProductCreator::GetArch()) : sformat("%1/boot/loader/isolinux.cfg", ProductCreator::skel_root); SCR::Write(.target.string, fname, ProductCreator::Config["bootconfig"]:"" ); @@ -369,7 +403,7 @@ { Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); } - string arch = Arch::architecture (); + string arch = ProductCreator::GetArch(); if (arch == "s390_64") arch = "s390x"; string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote((ProductCreator::Config["code10"]:false) ? arch : "")); @@ -481,6 +515,12 @@ boolean success = true; + string arch = ProductCreator::Config["arch"]:""; + if (arch != nil && arch != "") + { + ProductCreator::SetPackageArch(arch); + } + Progress::NextStage(); Pkg::TargetFinish (); @@ -552,7 +592,7 @@ // skip isolinux configuration if the architecture // is not i386 or x86_64 - there is no isolinux - if (Arch::architecture() != "i386" && Arch::architecture() != "x86_64") + if (ProductCreator::GetArch() != "i386" && ProductCreator::GetArch() != "x86_64") { return `skip_isolinux; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/src/dialogs.ycp new/yast2-product-creator-2.17.6/src/dialogs.ycp --- old/yast2-product-creator-2.17.5/src/dialogs.ycp 2008-06-17 09:55:55.000000000 +0200 +++ new/yast2-product-creator-2.17.6/src/dialogs.ycp 2008-08-11 12:02:47.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs definitions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: dialogs.ycp 48299 2008-06-13 14:14:30Z jsuchome $ + * $Id: dialogs.ycp 49917 2008-08-11 10:02:47Z lslezak $ */ { @@ -16,7 +16,6 @@ import "SourceManager"; import "Report"; import "URL"; - import "Arch"; import "Label"; import "Popup"; import "URL"; @@ -25,6 +24,7 @@ import "CWM"; import "String"; import "Package"; + import "Arch"; include "product-creator/routines.ycp"; include "product-creator/helps.ycp"; @@ -198,6 +198,13 @@ } else if(ret == `next ) { + // set architecture if configured + string arch = ProductCreator::Config["arch"]:""; + if (arch != nil && arch != "") + { + ProductCreator::SetPackageArch(arch); + } + string name = (string)UI::QueryWidget(`id(`name), `Value); if (name == "") @@ -419,6 +426,170 @@ return (symbol)ret; } +string AskArch(string label, list<string> archs, string preselected) +{ + term widget1 = `VBox(); + term widget2 = `VBox(); + + const integer max_lines = 6; + + if (!contains(archs, preselected)) + { + y2warning("The preselected architecture is missing in the list!"); + // add the missing preselected arch + archs = prepend(archs, preselected); + } + + integer archsz = size(archs); + integer col1num = (archsz > max_lines) ? (archsz + 1) / 2 : archsz; + y2milestone("Number of archs in the first column: %1", col1num); + + // preselect the first item + foreach(string a, archs, + { + if (col1num > 0) + { + widget1 = add(widget1, `MinWidth(10, `Left(`RadioButton(`id(a), a, a == preselected)))); + } + else + { + widget2 = add(widget2, `MinWidth(10, `Left(`RadioButton(`id(a), a, a == preselected)))); + } + + col1num = col1num - 1; + } + ); + + term content = `MarginBox(1, 0.5, + `VBox( + `Label(label), + `VSpacing(1), + `Frame(_("Target Architecture"), + `RadioButtonGroup(`id(`rb), + `HBox( + `Top(widget1), + `HStretch(), + `Top(widget2), + `HStretch() + ) + ) + ), + `VSpacing(1), + `HBox( + `HSpacing(`opt(`hstretch), 2), + `HWeight(1, `PushButton(`id(`ok), Label::OKButton())), + `HSpacing(2), + `HWeight(1, `PushButton(`id(`cancel), Label::CancelButton())), + `HSpacing(`opt(`hstretch), 2) + ) + ) + ); + + UI::OpenDialog(content); + + any ui = UI::UserInput(); + string ret = (string)UI::QueryWidget(`id(`rb), `CurrentButton); + + UI::CloseDialog(); + + if (ui == `cancel || ui == `close) + { + // canceled + return nil; + } + else if (ui == `ok) + { + y2milestone("Selected architecture: %1", ret); + return ret; + } + else + { + y2error("Unhandled user input %1", ui); + return nil; + } +} + + +boolean CheckArchitecture(integer SrcID) +{ + map general_info = Pkg::SourceGeneralData(SrcID); + boolean found_architecture = false; + list<string> found_archs = []; + + string arch = ProductCreator::GetArch(); + if (arch == "s390_64") arch = "s390x"; + + // architecture check is possible only for YaST sources + if (general_info["type"]:"" == "YaST") + { + // Check architecture + map<string,string> read_content = ProductCreator::ReadContentFile(SrcID); + y2milestone("content file: %1", read_content); + + foreach(string key, string value, read_content, + { + if (key == "ARCH." + arch) + { + found_architecture = true; + break; + } + else + { + string found_arch = regexpsub(key, "ARCH\\.(.*)", "\\1"); + + if (found_arch != nil) + { + found_archs = add(found_archs, found_arch); + } + } + } + ); + } + else + { + y2milestone("Not a YaST source, cannot verify the architecture"); + found_architecture = true; + } + + y2milestone("Architecture %1 is supported: %2", arch, found_architecture); + + if (found_architecture) + { + return true; + } + else + { + y2milestone("Supported architectures: %1", found_archs); + + if (size(found_archs) == 0) + { + y2milestone("The repository does not provide architecture data, assuming it is compatible"); + return true; + } + + // the architecture is different, ask to switch it + // %1 is URL of the repository + // %2 is name of the architecture (like i386, x86_64, ppc...) + string new_arch = AskArch( + sformat(_("Source %1 +does not support the current target architecture (%2). +Change the target architecture? +"), general_info["url"]:"", ProductCreator::GetArch()), + found_archs, found_archs[0]:""); + + // nil == switch has been canceled + if (new_arch != nil) + { + // change the architecture + ProductCreator::SetPackageArch(new_arch); + return true; + } + } + + return false; +} + + /** * Dialog for selecting the sources * @return symbol @@ -440,12 +611,22 @@ term buttons = - `HBox( - `PushButton(`id(`select), Label::SelectButton() ), - `PushButton(`id(`remove), Label::RemoveButton() ), - // push button label - `PushButton(`id(`create), _("Cr&eate New...")) - ); + `VBox( + `HBox( + `ReplacePoint(`id(`rp), + `Label(sformat(_("Target architecture: %1"), ProductCreator::GetArch())) + ), + `HSpacing(2), + `PushButton(`id(`arch), Label::EditButton()) + ), + `VSpacing(0.3), + `HBox( + `PushButton(`id(`select), Label::SelectButton() ), + `PushButton(`id(`remove), Label::RemoveButton() ), + // push button label + `PushButton(`id(`create), _("Cr&eate New...")) + ) + ); term contents = @@ -489,43 +670,17 @@ else if (ret == `select) { integer SrcID = (integer)UI::QueryWidget(`id(`table), `CurrentItem); - map general_info = Pkg::SourceGeneralData(SrcID); - boolean found_architecture = false; - string arch = Arch::architecture (); - if (arch == "s390_64") arch = "s390x"; + boolean repo_ok = CheckArchitecture(SrcID); - // architecture check is possible only for YaST sources - if (general_info["type"]:"" == "YaST") - { - // Check architecture - map<string,string> read_content = ProductCreator::ReadContentFile(SrcID); - y2milestone("content file: %1", read_content); - - foreach(string key, string value, read_content, - { - if (key == "ARCH." + arch) - { - found_architecture = true; - break; - } - } - ); - } - else - { - y2milestone("Not a YaST source, cannot verify the architecture"); - found_architecture = true; - } - - y2milestone("Architecture %1 is supported: %2", arch, found_architecture); - - if (found_architecture) + if (repo_ok) { if (!contains(selected_items, SrcID)) { selected_items = add (selected_items, SrcID ); + map general_info = Pkg::SourceGeneralData(SrcID); + // enable the source if (general_info["enabled"]:false) { @@ -534,12 +689,14 @@ } UI::ChangeWidget(`id(`table), `Item(SrcID, 0) , _("X")); - } - else - { - Report::Error(sformat(_("The source does not support the architecture of this machine (%1). -Select another source. -"), arch)); + + // refresh the target architecture if it has been changed + if (ProductCreator::GetPackageArch() != nil) + { + UI::ReplaceWidget(`rp, + `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetPackageArch())) + ); + } } } else if (ret == `remove) @@ -597,6 +754,68 @@ continue; } + string arch = ProductCreator::GetPackageArch() ; + + if (arch != nil) + { + y2milestone("Target architecture has been changed"); + ProductCreator::Config["arch"] = arch; + + boolean check_ok = true; + boolean arch_changed = false; + + do + { + string ar = ProductCreator::GetPackageArch(); + check_ok = true; + arch_changed = false; + + // all selected sources should be refreshed + // check archs onece again (needed after switching architecture multiple times) + foreach(integer src, selected_items, + { + if (!CheckArchitecture(src)) + { + check_ok = false; + break; + } + + arch_changed = arch_changed || (ar != ProductCreator::GetPackageArch()); + } + ); + } + while(arch_changed); + + if (!check_ok) + { + // error message + Report::Error(_("There is a mismatch between the selected +repositories and the machine architecture. + +Either select another repositories or +change the target architecture.")); + + // don't leave the dialog + continue; + } + + // temporarily initialize the target, read trusted GPG keys (needed for refresh) + Pkg::TargetInit("/", false); + + foreach(integer src, selected_items, + { + Pkg::SourceForceRefreshNow(src); + } + ); + + // reload repositories + Pkg::SourceFinishAll(); + Pkg::SourceStartManager(false); + + // finish the target + Pkg::TargetFinish(); + } + going_back = false; break; @@ -604,6 +823,34 @@ else if( ret == `back) { break; } + else if (ret == `arch) + { + // ask for the target architecture + string pkg_arch = ProductCreator::GetPackageArch(); + + if (pkg_arch == nil) + { + pkg_arch = Pkg::SystemArchitecture(); + } + + string new_arch = AskArch( + _("Select the new target architecture."), + // sort the list according to the current locale + lsort(["i386", "i486", "i586", "i686", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", + "s390", "s390x", "ia64", "x86_64"]), + pkg_arch); + + // nil == switch has been canceled + if (new_arch != nil && new_arch != "" && new_arch != pkg_arch) + { + // change the architecture + ProductCreator::SetPackageArch(new_arch); + + UI::ReplaceWidget(`rp, + `Label(sformat(_("Target Architecture: %1"), ProductCreator::GetPackageArch())) + ); + } + } else { y2error("unexpected retcode: %1", ret); continue; @@ -851,8 +1098,8 @@ // while the package manager is initialized UI::ReplaceWidget(`rep, mode == nil ? - `PackageSelector(`id(`packages )) : - `PackageSelector(`id(`packages ), `opt(mode)) + `PackageSelector(`id(`packages)) : + `PackageSelector(`id(`packages), `opt(mode)) ); symbol result = (symbol) UI::RunPkgSelection(`id(`packages ) ); @@ -1262,19 +1509,33 @@ */ define symbol packageSelector() { - string base_pattern = ProductCreator::Config["base"]:""; - list<string> patterns = ProductCreator::Config["addons"]:[]; - list<string> packages = ProductCreator::Config["packages"]:[]; - list<string> taboo = ProductCreator::Config["taboo"]:[]; - - map<string,any> result = runPackageSelector(base_pattern, patterns, packages, taboo, `patterns); - - ProductCreator::Config["base"] = result["base"]:""; - ProductCreator::Config["addons"] = result["addons"]:[]; - ProductCreator::Config["packages"] = result["packages"]:[]; - ProductCreator::Config["taboo"] = result["taboo"]:[]; - ProductCreator::Config["code10"] = result["code10"]:true; - ProductCreator::Config["type"] = result["type"]:`patterns; + map<string,any> result = $[]; + + do + { + string base_pattern = ProductCreator::Config["base"]:""; + list<string> patterns = ProductCreator::Config["addons"]:[]; + list<string> packages = ProductCreator::Config["packages"]:[]; + list<string> taboo = ProductCreator::Config["taboo"]:[]; + + result = runPackageSelector(base_pattern, patterns, packages, taboo, `patterns); + + y2debug("Package selector result: %1", result); + + ProductCreator::Config["base"] = result["base"]:""; + ProductCreator::Config["addons"] = result["addons"]:[]; + ProductCreator::Config["packages"] = result["packages"]:[]; + ProductCreator::Config["taboo"] = result["taboo"]:[]; + ProductCreator::Config["code10"] = result["code10"]:true; + ProductCreator::Config["type"] = result["type"]:`patterns; + } + while(result["ui"]:`next == `cancel && !ProductCreator::ReallyAbort()); + + // the package selector returns `cancel when pressing [Abort] + if (result["ui"]:`next == `cancel) + { + return `abort; + } return result["ui"]:`next; } @@ -1361,15 +1622,21 @@ GPGWidgets::SetSelectedPrivateKey(ProductCreator::Config["gpg_key"]:""); } - symbol ret = CWM::ShowAndRun ($[ - "widget_names" : ["sign_checkbox", "select_private_key", "create_new_key"], - "widget_descr" : union(GPGWidgets::Widgets(), sign_checkbox_widget()), - "contents" : GpgDialogContent(), - "caption" : caption, - "back_button" : Label::BackButton (), - "next_button" : Label::NextButton (), - "fallback_functions" : $[] - ]); + symbol ret = nil; + + do + { + ret = CWM::ShowAndRun ($[ + "widget_names" : ["sign_checkbox", "select_private_key", "create_new_key"], + "widget_descr" : union(GPGWidgets::Widgets(), sign_checkbox_widget()), + "contents" : GpgDialogContent(), + "caption" : caption, + "back_button" : Label::BackButton (), + "next_button" : Label::NextButton (), + "fallback_functions" : $[] + ]); + } + while(ret == `abort && !ProductCreator::ReallyAbort()); boolean sign = (boolean)UI::QueryWidget(`id("sign_checkbox"), `Value); y2milestone("Sign the medium: %1", sign); @@ -1417,6 +1684,16 @@ summary = Summary::AddLine(summary, sformat(_("Selected %1 packages"), size(Pkg::GetPackages(`selected, true)))); + string arch = ProductCreator::Config["arch"]:""; + // display the architecture in the summary if it has been changed + if (arch != nil && arch != "" && arch != Arch::architecture()) + { + summary = Summary::AddHeader(summary, _("Architecture") ); + + // summary line, %1 is e.g. i386, x86_64, ppc... + summary = Summary::AddLine(summary, sformat(_("Target architectrure: %1"), arch)); + } + // summary caption summary = Summary::AddHeader(summary,_("Output Directory")); @@ -1488,6 +1765,12 @@ repeat { ret = UI::UserInput(); + + if (ret == `abort && !ProductCreator::ReallyAbort()) + { + // abort canceled + ret = `dummy; + } } until (ret == `next || ret == `back || ret == `abort); Wizard::CloseDialog(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/src/helps.ycp new/yast2-product-creator-2.17.6/src/helps.ycp --- old/yast2-product-creator-2.17.5/src/helps.ycp 2008-06-13 16:30:17.000000000 +0200 +++ new/yast2-product-creator-2.17.6/src/helps.ycp 2008-08-11 12:02:47.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: helps.ycp 48304 2008-06-13 14:30:50Z jsuchome $ + * $Id: helps.ycp 49917 2008-08-11 10:02:47Z lslezak $ */ { @@ -91,10 +91,18 @@ "), - /* Configure2 dialog help 1/2 */ + /* Source selection help 1/2 */ "sourceDialog" : _("<big>Select Package Sources</big> Select at least one package source. -"), +") + /* Source selection help 2/2 */ + + _("<big>Target Architecture</big> +It is possible to create a product for different architecture than the architecture of this machine. +All selected repositories must support the target architecture. +Note: KIWI does not support different architectures yet, do not change the +architecture if you intend to create a KIWI image from the current configuration. +") + , /* Configure2 dialog help 1/2 */ "dest" : _("<big>ISO Directory and Image</big> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/src/kiwi_dialogs.ycp new/yast2-product-creator-2.17.6/src/kiwi_dialogs.ycp --- old/yast2-product-creator-2.17.5/src/kiwi_dialogs.ycp 2008-08-01 15:36:26.000000000 +0200 +++ new/yast2-product-creator-2.17.6/src/kiwi_dialogs.ycp 2008-08-06 10:34:09.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialogs for kiwi configuration * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: kiwi_dialogs.ycp 49408 2008-07-25 08:14:04Z jsuchome $ + * $Id: kiwi_dialogs.ycp 49582 2008-08-01 13:44:06Z jsuchome $ */ { textdomain "product-creator"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/src/ProductCreator.ycp new/yast2-product-creator-2.17.6/src/ProductCreator.ycp --- old/yast2-product-creator-2.17.5/src/ProductCreator.ycp 2008-06-18 13:23:59.000000000 +0200 +++ new/yast2-product-creator-2.17.6/src/ProductCreator.ycp 2008-08-11 12:02:47.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for configuration of product-creator, input and output functions. * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: ProductCreator.ycp 48389 2008-06-18 11:24:45Z jsuchome $ + * $Id: ProductCreator.ycp 49917 2008-08-11 10:02:47Z lslezak $ * * Representation of the configuration of product-creator. * Input and output routines. @@ -26,6 +26,7 @@ import "Directory"; import "Profile"; import "AutoinstSoftware"; +// NOTE: do not use Arch:: directly in this module, use GetArch() function instead! import "Arch"; import "Package"; import "PackageAI"; @@ -93,6 +94,109 @@ */ global block<boolean> AbortFunction = nil; + +/* + Target architecture + Initialized to the current architecture +*/ + +// forward declaration +string ToPackageArch(string arch); + +// default is the system architecture +string _arch = nil; + +string ToPackageArch(string arch) +{ + if (arch == "s390_64") + { + arch = "s390x"; + } + if (arch == "s390_32") + { + arch = "s390"; + } + + if (!contains(["i386", "i486", "i586", "i686", "sparc", "sparc64", "mips", "mips64", "ppc", "ppc64", "alpha", "s390", "s390x", "ia64", "x86_64"], arch)) + { + y2error("Unknown architecture '%1'!", arch); + return nil; + } + + return arch; +} + +/** + Set the target package architecture + @param new_arch new architecture (i386, i486, i586, i686, sparc, sparc64, mips, mips64, ppc, ppc64, alpha, s390, s390x, ia64, x86_64) + @return true on success +*/ +global boolean SetPackageArch(string new_arch) +{ + string pkgarch = ToPackageArch(new_arch); + + if (pkgarch == nil) + { + return false; + } + + _arch = pkgarch; + y2milestone("Target architecture set to '%1'", new_arch); + + // set the architecture in the package manager + Pkg::SetArchitecture(_arch); + + return true; +} + +// convert package (like i686) arch to system arch (i386) +global string GetArch() +{ + string ret = _arch; + + // not set, use the current arch + if (ret == nil) + { + ret = Arch::architecture(); + } + + // convert x86 package archs to i386 system arch + if (contains(["i486", "i586", "i686"], ret)) + { + ret = "i386"; + } + else if (ret == "s390_64") + { + ret = "s390x"; + } + else if (ret == "s390_32") + { + ret = "s390"; + } + + return ret; +} + +// nil means not set +global string GetPackageArch() +{ + return _arch; +} + +global void ResetArch() +{ + _arch = nil; + + if (Pkg::GetArchitecture() != Pkg::SystemArchitecture()) + { + // set the system architecture in the package manager + y2milestone("Resetting the target architecture to '%1'", Pkg::SystemArchitecture()); + Pkg::SetArchitecture(Pkg::SystemArchitecture()); + } +} + + + /** * Data was modified? */ @@ -178,7 +282,7 @@ global boolean isCode10Source() { boolean code10 = false; - string arch = Arch::architecture (); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; foreach (string url , ProductCreator::Config["sources"]:[], { @@ -619,7 +723,7 @@ } else { - string arch = Arch::architecture(); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; bootconfig_path = sformat("boot/%1/loader/isolinux.cfg", arch); @@ -961,84 +1065,66 @@ boolean CopyPPCBoot(integer srcid, string target) { y2milestone("Copying PPC boot files"); + boolean ret = true; - list<string> lst = GetList(srcid, 1, ""); - if (lst == nil) + y2milestone("Copying /ppc subdirectory"); + boolean r = CopyDirectoryRecOpt(srcid, 1, "/ppc", target); + + if (!r) { - lst = []; + y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); + CopyFile(srcid, 1, "/ppc/bootinfo.txt", target + "/ppc"); } - boolean ret = true; + ret = ret && r; - if (contains(lst, "ppc/")) - { - y2milestone("Copying /ppc subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/ppc", target); - if (!r) - { - y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); - CopyFile(srcid, 1, "/ppc/bootinfo.txt", target + "/ppc"); - } + y2milestone("Copying /PS3 subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/PS3", target); - ret = ret && r; + if (!r) + { + y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); + Exec(sformat("/bin/mkdir -p '%1/PS3/otheros'", String::Quote(target))); + CopyFile(srcid, 1, "/PS3/otheros/otheros.bld", target + "/PS3/otheros"); } - if (contains(lst, "PS3/")) - { - y2milestone("Copying /ppc subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/PS3", target); + ret = ret && r; - if (!r) - { - y2milestone("Directory listing may be missing, copying /ppc/bootinfo.txt"); - Exec(sformat("/bin/mkdir -p '%1/PS3/otheros'", String::Quote(target))); - CopyFile(srcid, 1, "/PS3/otheros/otheros.bld", target + "/PS3/otheros"); - } - ret = ret && r; - } + y2milestone("Copying /suseboot subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/suseboot", target); + y2milestone("Result: %1", r); - if (contains(lst, "suseboot/")) + if (!r) { - y2milestone("Copying /suseboot subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/suseboot", target); - y2milestone("Result: %1", r); - - if (!r) - { - list<string> files = [ - "/suseboot/inst32", "/suseboot/inst64", "/suseboot/os-chooser", - "/suseboot/yaboot", "/suseboot/yaboot.cnf", "/suseboot/yaboot.ibm", - "/suseboot/yaboot.txt" - ]; - - y2milestone("Directory listing may be missing using fixed list: %1", files); + list<string> files = [ + "/suseboot/inst32", "/suseboot/inst64", "/suseboot/os-chooser", + "/suseboot/yaboot", "/suseboot/yaboot.cnf", "/suseboot/yaboot.ibm", + "/suseboot/yaboot.txt" + ]; - foreach(string f, files, - { - CopyFile(srcid, 1, f, target + f); - } - ); - } + y2milestone("Directory listing may be missing using fixed list: %1", files); - ret = ret && r; + foreach(string f, files, + { + CopyFile(srcid, 1, f, target + f); + } + ); } - if (contains(lst, "etc/")) - { - y2milestone("Copying /etc subdirectory"); - boolean r = CopyDirectoryRecOpt(srcid, 1, "/etc", target); - if (!r) - { - y2milestone("Directory listing may be missing, copying /etc/yaboot.conf"); - CopyFile(srcid, 1, "/etc/yaboot.conf", target + "/etc"); - } + y2milestone("Copying /etc subdirectory"); + r = CopyDirectoryRecOpt(srcid, 1, "/etc", target); - ret = ret && r; + if (!r) + { + y2milestone("Directory listing may be missing, copying /etc/yaboot.conf"); + CopyOptionalFile(srcid, 1, "/etc/yaboot.conf", target + "/etc"); } + ret = ret && r; + return ret; } @@ -1356,7 +1442,7 @@ string sles_path = ""; integer sles_src = 0; string descr_dir = ""; - string arch = Arch::architecture(); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; y2milestone("Config: %1", Config); @@ -1390,7 +1476,7 @@ if (bootable_product) { - if (Arch::i386() || Arch::x86_64()) + if (_arch == "i386" || _arch == "x86_64") { if (Config["code10"]:false) { @@ -1401,7 +1487,7 @@ Exec(sformat("/bin/mkdir -p '%1/boot/loader'", String::Quote(skel_root))); } } - else if (Arch::ppc() || Arch::ppc64()) + else if (_arch == "ppc" || _arch == "ppc64") { Exec(sformat("/bin/mkdir -p '%1/PS3'", String::Quote(skel_root))); Exec(sformat("/bin/mkdir -p '%1/ppc'", String::Quote(skel_root))); @@ -1473,7 +1559,7 @@ CopyFile(id, 1, "boot/rescue", sformat("%1/boot", skel_root)); } // Loader, x86 specific - if (Arch::i386() || Arch::x86_64()) + if (_arch == "i386" || _arch == "x86_64") { if (Config["code10"]:false) { @@ -1489,7 +1575,7 @@ CopyDirectoryRec(id, 1, "boot/loader", sformat("%1/boot", skel_root)); } } - else if (Arch::ppc() || Arch::ppc64()) + else if (_arch == "ppc" || _arch == "ppc64") { // recursive copy of /boot CopyDirectoryRec(id, 1, "boot", skel_root); @@ -1503,7 +1589,7 @@ { CopyDirectoryRec(id, 1, "boot", skel_root); - if (Arch::ppc() || Arch::ppc64()) + if (_arch == "ppc" || _arch == "ppc64") { CopyPPCBoot(id, skel_root); } @@ -1643,7 +1729,7 @@ } // Loader, x86 specific - if (Arch::i386() || Arch::x86_64()) + if (_arch == "i386" || _arch == "x86_64") { if (Config["code10"]:false) { @@ -1659,7 +1745,7 @@ CopyDirectoryRec(base_source, 1, "boot/loader", sformat("%1/boot", skel_root)); } } - else if (Arch::ppc() || Arch::ppc64()) + else if (_arch == "ppc" || _arch == "ppc64") { CopyPPCBoot(base_source, skel_root); @@ -1676,7 +1762,7 @@ { CopyDirectoryRec(base_source, 1, "boot", skel_root); - if (Arch::ppc() || Arch::ppc64()) + if (_arch == "ppc" || _arch == "ppc64") { CopyPPCBoot(base_source, skel_root); } @@ -2268,7 +2354,7 @@ global define boolean CopyMiscFiles() ``{ string cpCmd = ""; - string arch = Arch::architecture(); + string arch = GetArch(); if (arch == "s390_64") arch = "s390x"; y2debug("isolinux.cfg: %1", Config["bootconfig"]:"" ); if (Config["bootconfig"]:"" != "") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/src/wizards.ycp new/yast2-product-creator-2.17.6/src/wizards.ycp --- old/yast2-product-creator-2.17.5/src/wizards.ycp 2008-06-13 10:39:59.000000000 +0200 +++ new/yast2-product-creator-2.17.6/src/wizards.ycp 2008-08-11 12:02:47.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Wizards definitions * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: wizards.ycp 48277 2008-06-13 08:40:32Z jsuchome $ + * $Id: wizards.ycp 49917 2008-08-11 10:02:47Z lslezak $ */ { @@ -303,7 +303,7 @@ list<string> required_packages = ["inst-source-utils", "mkisofs", "createrepo"]; // add PPC specific packages - if (Arch::architecture() == "ppc" || Arch::architecture() == "ppc64") + if (ProductCreator::GetArch() == "ppc" || ProductCreator::GetArch() == "ppc64") { // /bin/objcopy - binutils // /bin/mkzimage - lilo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-product-creator-2.17.5/VERSION new/yast2-product-creator-2.17.6/VERSION --- old/yast2-product-creator-2.17.5/VERSION 2008-08-01 15:37:09.000000000 +0200 +++ new/yast2-product-creator-2.17.6/VERSION 2008-08-11 11:59:19.000000000 +0200 @@ -1 +1 @@ -2.17.5 +2.17.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-printer
by root＠Hilbert.suse.de 11 Aug '08

11 Aug '08

Hello community, here is the log from the commit of package yast2-printer checked in at Tue Aug 12 00:34:53 CEST 2008. -------- --- yast2-printer/yast2-printer.changes 2008-06-25 14:18:57.000000000 +0200 +++ yast2-printer/yast2-printer.changes 2008-08-11 14:15:35.693734000 +0200 @@ -1,0 +2,6 @@ +Mon Aug 11 14:11:31 CEST 2008 - mzugec(a)suse.cz + +- major code changes based on Johannes Meixner's code +- 2.17.2 + +------------------------------------------------------------------- Old: ---- yast2-printer-2.17.1.tar.bz2 New: ---- yast2-printer-2.17.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-printer.spec ++++++ --- /var/tmp/diff_new_pack.O10432/_old 2008-08-12 00:34:04.000000000 +0200 +++ /var/tmp/diff_new_pack.O10432/_new 2008-08-12 00:34:04.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-printer (Version 2.17.1) +# spec file for package yast2-printer (Version 2.17.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,17 +20,16 @@ Url: http://en.opensuse.org/YaST/Modules/Printer Name: yast2-printer -Version: 2.17.1 -Release: 2 +Version: 2.17.2 +Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-printer-2.17.1.tar.bz2 +Source0: yast2-printer-2.17.2.tar.bz2 Prefix: /usr -BuildRequires: blocxx-devel cups-devel cups-drivers cups-drivers-stp docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt openssl-devel perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-inetd yast2-testsuite zlib-devel -Requires: zlib blocxx yast2-inetd +BuildRequires: cups-devel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite Recommends: netcat -Requires: /usr/bin/host cups-libs +Requires: /usr/bin/host cups-libs cups-devel Requires: yast2 >= 2.16.12 #Requires: cups >= 1.2 Provides: yast2-config-cups yast2-agent-printerdb yast2-agent-cups yast2-lib-printer yast2-config-printer y2c_cups y2c_prnt y2l_printer y2a_cups y2a_printerdb yast2-trans-printer yast2-trans-libprinter yast2-trans-printerdb yast2-trans-cups yast2-printerdb-devel yast2-cups-devel @@ -35,7 +41,7 @@ %package devel-doc License: GPL v2 or later Group: Documentation/SUSE -BuildRequires: cups-devel yast2-core-devel zlib-devel +BuildRequires: cups-devel yast2-core-devel Summary: YaST2 - Developer documentation for yast2-printer %description @@ -58,7 +64,7 @@ Michal Zugec <mzugec(a)suse.cz> %prep -%setup -n yast2-printer-2.17.1 +%setup -n yast2-printer-2.17.2 %build %{prefix}/bin/y2tool y2autoconf @@ -77,13 +83,8 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done -#mkdir -p $RPM_BUILD_ROOT/var/lib/YaST2/ -#touch $RPM_BUILD_ROOT/var/lib/YaST2/ppd_db.ycp %post -rm -rf %{buildroot}/%{_libdir}/YaST2/plugin/libpy2ag_*.la -# delete ppd_db.ycp because of CUPS 1.1->1.2 (bugzilla #214265) -#rm -f /var/lib/YaST2/ppd_db.ycp %clean rm -rf "$RPM_BUILD_ROOT" @@ -91,43 +92,20 @@ %files %defattr(-,root,root) %dir /usr/share/YaST2/include/printer -%dir /usr/share/YaST2/data/printer +#%dir /usr/share/YaST2/data/printer %{prefix}/share/applications/YaST2/printer.desktop /usr/share/YaST2/modules/*.y* /usr/share/YaST2/clients/printer* /usr/share/YaST2/include/printer/* +# check this - we need AY support! /usr/share/YaST2/schema/autoyast/rnc/printer.rnc #data -/usr/share/YaST2/data/printer/testpg.* -/usr/share/YaST2/data/printer/models.equiv -/usr/share/YaST2/data/printer/ppd_preference_list -/usr/share/YaST2/data/printer/printers_support -/usr/share/YaST2/data/printer/hp_all_in_one_model_list -/usr/share/YaST2/scrconf/*.scr -/usr/lib/YaST2/servers_non_y2/ag_ppd_file_modify -%{prefix}/lib/YaST2/bin/test_device -%{prefix}/lib/YaST2/bin/test_remote_lpd -%{prefix}/lib/YaST2/bin/test_remote_ipp -%{prefix}/lib/YaST2/bin/test_remote_socket -%{prefix}/lib/YaST2/bin/test_remote_smb -%{prefix}/lib/YaST2/bin/test_remote_novell -%{prefix}/lib/YaST2/bin/listen_remote_ipp -%{prefix}/lib/YaST2/bin/real_resolution -%{prefix}/lib/YaST2/bin/process_ppd_files -%{prefix}/lib/YaST2/bin/assign_printcap_default -%{prefix}/lib/YaST2/bin/prepare_ps_testpage.pl -/usr/lib/YaST2/servers_non_y2/ag_smb_queues -#CUPS stuff -%{_libdir}/YaST2/plugin/libpy2ag_cups.so.* -#PPD agent stuff -%{_libdir}/YaST2/plugin/libpy2ag_ppd.so.* -#PPD agent prebuilt data -%ghost /var/lib/YaST2/ppd_db.ycp -#Devel stuff -%{_libdir}/YaST2/plugin/libpy2ag_cups.so -%{_libdir}/YaST2/plugin/libpy2ag_cups.la -%{_libdir}/YaST2/plugin/libpy2ag_ppd.so -%{_libdir}/YaST2/plugin/libpy2ag_ppd.la +#check this - we need testpage! +#/usr/share/YaST2/data/printer/testpg.* +%{prefix}/lib/YaST2/bin/autodetect_print_queues +%{prefix}/lib/YaST2/bin/autodetect_printers +%{prefix}/lib/YaST2/bin/create_printer_ppd_database +%{prefix}/lib/YaST2/bin/determine_printer_driver_options #Documentation %dir %{prefix}/share/doc/packages/yast2-printer %{prefix}/share/doc/packages/yast2-printer/COPYING @@ -139,6 +117,9 @@ %exclude %{prefix}/share/doc/packages/yast2-printer/COPYING %exclude %{prefix}/share/doc/packages/yast2-printer/README %changelog +* Mon Aug 11 2008 mzugec(a)suse.cz +- major code changes based on Johannes Meixner's code +- 2.17.2 * Wed Jun 11 2008 mzugec(a)suse.de - "change connection" - backend validation (bnc#388575) - 2.17.1 ++++++ yast2-printer-2.17.1.tar.bz2 -> yast2-printer-2.17.2.tar.bz2 ++++++ ++++ 92272 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0