- openSUSE Commits

commit yast2-packager
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package yast2-packager checked in at Wed Apr 5 10:26:35 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-04-04 19:53:40.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-04-05 09:54:09.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 5 09:49:01 CEST 2006 - visnov(a)suse.cz + +- Show the type of the source in installation sources module if needed +- 2.13.60 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.59.tar.bz2 New: ---- yast2-packager-2.13.60.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.kXaE5i/_old 2006-04-05 10:25:29.000000000 +0200 +++ /var/tmp/diff_new_pack.kXaE5i/_new 2006-04-05 10:25:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.59) +# spec file for package yast2-packager (Version 2.13.60) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.59 +Version: 2.13.60 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.59.tar.bz2 +Source0: yast2-packager-2.13.60.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -41,7 +41,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.59 +%setup -n yast2-packager-2.13.60 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,9 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Wed Apr 05 2006 - visnov(a)suse.cz +- Show the type of the source in installation sources module if needed +- 2.13.60 * Tue Apr 04 2006 - jsrain(a)suse.de - fixed servicepack.tgz integration - added support for loopback mounted ISO (#159565) ++++++ yast2-packager-2.13.59.tar.bz2 -> yast2-packager-2.13.60.tar.bz2 ++++++ ++++ 2386 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.59/Makefile.am new/yast2-packager-2.13.60/Makefile.am --- old/yast2-packager-2.13.59/Makefile.am 2006-04-04 19:53:47.000000000 +0200 +++ new/yast2-packager-2.13.60/Makefile.am 2006-03-13 14:18:11.000000000 +0100 @@ -154,7 +154,7 @@ $(PREFIX)/bin/y2tool create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-all-packages package-local TAGVERSION = $(PREFIX)/bin/y2tool tagversion @@ -199,9 +199,6 @@ false; \ fi -check-textdomain: - $(PREFIX)/bin/y2tool check-textdomain $(srcdir) - stable: checkin-stable checkin-stable: package diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.59/VERSION new/yast2-packager-2.13.60/VERSION --- old/yast2-packager-2.13.59/VERSION 2006-04-04 19:51:07.000000000 +0200 +++ new/yast2-packager-2.13.60/VERSION 2006-04-05 09:49:53.000000000 +0200 @@ -1 +1 @@ -2.13.59 +2.13.60 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.59/configure.in new/yast2-packager-2.13.60/configure.in --- old/yast2-packager-2.13.59/configure.in 2006-04-04 19:53:47.000000000 +0200 +++ new/yast2-packager-2.13.60/configure.in 2006-03-13 14:18:11.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.59, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.41, http://www.suse.de/feedback, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.59" +VERSION="2.13.41" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.59/src/clients/inst_source.ycp new/yast2-packager-2.13.60/src/clients/inst_source.ycp --- old/yast2-packager-2.13.59/src/clients/inst_source.ycp 2006-03-30 19:23:46.000000000 +0200 +++ new/yast2-packager-2.13.60/src/clients/inst_source.ycp 2006-04-05 09:48:34.000000000 +0200 @@ -66,7 +66,8 @@ // corresponds to the "Enable/Disable" button source[ "enabled" ]:true ? _("On") : _("Off"), source["autorefresh"]:true ? _("On") : _("Off"), - productData[ "label" ]:"unknown", + // translators: unknown name for a given source + productData[ "label" ]:generalData[ "type" ]: _("unknown"), generalData[ "url" ]:"" ); return item; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit libzypp
by root＠suse.de 05 Apr '06

05 Apr '06

Hello community, here is the log from the commit of package libzypp checked in at Wed Apr 5 09:52:41 CEST 2006. -------- --- libzypp/libzypp.changes 2006-04-04 17:49:31.000000000 +0200 +++ libzypp/libzypp.changes 2006-04-05 09:51:29.000000000 +0200 @@ -1,0 +2,21 @@ +Wed Apr 5 09:27:08 CEST 2006 - visnov(a)suse.cz + +- properly initialize autorefresh for non-remote sources (#154990) +- rev 2919 + +------------------------------------------------------------------- +Tue Apr 4 19:19:39 CEST 2006 - mt(a)suse.de + +- Added flag to MediaManager::isUseableAttachPoint, whether + to check against system mount entries or not. +- Disallow to use the attachpoints of another media handlers + as source path in MediaDIR. +- rev 2917 + +------------------------------------------------------------------- +Tue Apr 4 18:47:01 CEST 2006 - dmacvicar(a)suse.de + +-implement callbacks for when package verification (checksum) + fails, offer to retry or abort + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.jUh1gG/_old 2006-04-05 09:52:17.000000000 +0200 +++ /var/tmp/diff_new_pack.jUh1gG/_new 2006-04-05 09:52:17.000000000 +0200 @@ -18,7 +18,7 @@ Autoreqprov: on Summary: Package, Patch, Pattern, and Product Management Version: 0.0.8 -Release: 74 +Release: 75 Source: zypp-0.0.0.tar.bz2 Prefix: /usr Provides: yast2-packagemanager @@ -104,6 +104,18 @@ %{_libdir}/pkgconfig/libzypp.pc %changelog -n libzypp +* Wed Apr 05 2006 - visnov(a)suse.cz +- properly initialize autorefresh for non-remote sources (#154990) +- rev 2919 +* Tue Apr 04 2006 - mt(a)suse.de +- Added flag to MediaManager::isUseableAttachPoint, whether + to check against system mount entries or not. +- Disallow to use the attachpoints of another media handlers + as source path in MediaDIR. +- rev 2917 +* Tue Apr 04 2006 - dmacvicar(a)suse.de +-implement callbacks for when package verification (checksum) + fails, offer to retry or abort * Tue Apr 04 2006 - dmacvicar(a)suse.de - Fix construction of checksum objects when using non-standard checksum algorithms ++++++ zypp-0.0.0.tar.bz2 ++++++ libzypp/zypp-0.0.0.tar.bz2 libzypp/zypp-0.0.0.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-bootloader
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed Apr 5 01:58:03 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-04-05 01:22:18.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-04-05 01:50:12.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Apr 5 01:49:23 CEST 2006 - od(a)suse.de + +- changed more prep_boot_partition from "/dev/null" to "" (#163387) +- 2.13.38 + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.37.tar.bz2 New: ---- yast2-bootloader-2.13.38.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.PKaXos/_old 2006-04-05 01:57:34.000000000 +0200 +++ /var/tmp/diff_new_pack.PKaXos/_new 2006-04-05 01:57:34.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.37) +# spec file for package yast2-bootloader (Version 2.13.38) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.37 +Version: 2.13.38 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.37.tar.bz2 +Source0: yast2-bootloader-2.13.38.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.37 +%setup -n yast2-bootloader-2.13.38 %build %{prefix}/bin/y2tool y2autoconf @@ -112,6 +112,9 @@ %changelog -n yast2-bootloader * Wed Apr 05 2006 - od(a)suse.de +- changed more prep_boot_partition from "/dev/null" to "" (#163387) +- 2.13.38 +* Wed Apr 05 2006 - od(a)suse.de - use empty string when no prep boot or FAT partition is found (#163387) - 2.13.37 ++++++ yast2-bootloader-2.13.37.tar.bz2 -> yast2-bootloader-2.13.38.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.37/VERSION new/yast2-bootloader-2.13.38/VERSION --- old/yast2-bootloader-2.13.37/VERSION 2006-04-05 01:21:02.000000000 +0200 +++ new/yast2-bootloader-2.13.38/VERSION 2006-04-05 01:49:10.000000000 +0200 @@ -1 +1 @@ -2.13.37 +2.13.38 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.37/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.38/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.13.37/src/modules/BootPOWERLILO.ycp 2006-04-05 01:20:58.000000000 +0200 +++ new/yast2-bootloader-2.13.38/src/modules/BootPOWERLILO.ycp 2006-04-05 01:49:05.000000000 +0200 @@ -14,7 +14,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootPOWERLILO.ycp 29685 2006-04-04 23:20:54Z odabrunz $ + * $Id: BootPOWERLILO.ycp 29688 2006-04-04 23:48:59Z odabrunz $ * */ @@ -687,7 +687,7 @@ result = add (result, sformat (_("Sections: %1"), String::EscapeTags (mergestring (sects, ", ")))); - // FIXME: does the following code make any sense for ppc? + // FIXME: does the following code make any sense for ppc? (see also #163387) if (BootCommon::loader_device == "/dev/null") // summary text result = add (result, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.37/src/ppc/chrp.ycp new/yast2-bootloader-2.13.38/src/ppc/chrp.ycp --- old/yast2-bootloader-2.13.37/src/ppc/chrp.ycp 2006-03-08 00:31:50.000000000 +0100 +++ new/yast2-bootloader-2.13.38/src/ppc/chrp.ycp 2006-04-05 01:49:05.000000000 +0200 @@ -12,7 +12,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: chrp.ycp 28687 2006-03-07 23:31:47Z odabrunz $ + * $Id: chrp.ycp 29688 2006-04-04 23:48:59Z odabrunz $ * */ @@ -37,11 +37,10 @@ return; } - if ( ! (size (prep_boot_partitions) > 0 || - (prep_boot_partition != "" && prep_boot_partition != "/dev/null"))) + if ( ! (size (prep_boot_partitions) > 0 || prep_boot_partition != "")) { BootCommon::activate = false; - prep_boot_partition = "/dev/null"; + prep_boot_partition = ""; } else { @@ -55,8 +54,7 @@ */ global define boolean CHRPRead () ``{ prep_boot_partition = (string) BootCommon::globals["boot"]:""; - BootCommon::activate - = prep_boot_partition != "" && prep_boot_partition != "/dev/null"; + BootCommon::activate = prep_boot_partition != ""; of_defaultdevice = ( BootCommon::globals["activate"]:"false" == "true" ? true : false ); return true; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.37/src/ppc/iseries.ycp new/yast2-bootloader-2.13.38/src/ppc/iseries.ycp --- old/yast2-bootloader-2.13.37/src/ppc/iseries.ycp 2006-03-07 22:16:45.000000000 +0100 +++ new/yast2-bootloader-2.13.38/src/ppc/iseries.ycp 2006-04-05 01:49:06.000000000 +0200 @@ -12,7 +12,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: iseries.ycp 28675 2006-03-07 21:16:39Z odabrunz $ + * $Id: iseries.ycp 29688 2006-04-04 23:48:59Z odabrunz $ * */ @@ -101,7 +101,7 @@ * @return boolean true on success */ global define boolean iSeriesRead () ``{ - prep_boot_partition = "/dev/null"; + prep_boot_partition = ""; iseries_streamfile = ""; iseries_write_slot_b = false; iseries_write_prepboot = false; @@ -121,7 +121,7 @@ else if (type == `prep) { iseries_write_prepboot = true; - if (prep_boot_partition == "/dev/null") + if (prep_boot_partition == "") { prep_boot_partition = target; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.37/src/ppc/misc.ycp new/yast2-bootloader-2.13.38/src/ppc/misc.ycp --- old/yast2-bootloader-2.13.37/src/ppc/misc.ycp 2006-03-30 16:43:27.000000000 +0200 +++ new/yast2-bootloader-2.13.38/src/ppc/misc.ycp 2006-04-05 01:49:06.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: misc.ycp 29550 2006-03-30 09:01:31Z mvidner $ + * $Id: misc.ycp 29688 2006-04-04 23:48:59Z odabrunz $ * */ @@ -184,8 +184,7 @@ } y2milestone ("Selected PReP boot partition: %1", prep_boot_partition); - BootCommon::activate = (prep_boot_partition != "" - && prep_boot_partition != "/dev/null"); + BootCommon::activate = (prep_boot_partition != ""); y2milestone ("Install bootloader: %1", BootCommon::activate); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.37/src/ppc/prep.ycp new/yast2-bootloader-2.13.38/src/ppc/prep.ycp --- old/yast2-bootloader-2.13.37/src/ppc/prep.ycp 2006-03-07 22:16:46.000000000 +0100 +++ new/yast2-bootloader-2.13.38/src/ppc/prep.ycp 2006-04-05 01:49:06.000000000 +0200 @@ -12,7 +12,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: prep.ycp 28675 2006-03-07 21:16:39Z odabrunz $ + * $Id: prep.ycp 29688 2006-04-04 23:48:59Z odabrunz $ * */ @@ -38,11 +38,10 @@ return; } - if ( ! (size (prep_boot_partitions) > 0 || - (prep_boot_partition != "" && prep_boot_partition != "/dev/null"))) + if ( ! (size (prep_boot_partitions) > 0 || prep_boot_partition != "")) { BootCommon::activate = false; - prep_boot_partition = "/dev/null"; + prep_boot_partition = ""; } else { @@ -56,8 +55,7 @@ */ global define boolean PRePRead () ``{ prep_boot_partition = (string) BootCommon::globals["boot"]:""; - BootCommon::activate - = prep_boot_partition != "" && prep_boot_partition != "/dev/null"; + BootCommon::activate = prep_boot_partition != ""; return true; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-bootloader
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package yast2-bootloader checked in at Wed Apr 5 01:45:45 CEST 2006. -------- --- yast2-bootloader/yast2-bootloader.changes 2006-04-03 20:55:01.000000000 +0200 +++ yast2-bootloader/yast2-bootloader.changes 2006-04-05 01:22:18.000000000 +0200 @@ -1,0 +2,13 @@ +Wed Apr 5 01:21:17 CEST 2006 - od(a)suse.de + +- use empty string when no prep boot or FAT partition is found + (#163387) +- 2.13.37 + +------------------------------------------------------------------- +Tue Apr 4 17:00:12 CEST 2006 - jplack(a)suse.de + +- update list of possible selections, each time a generic widget is + "called" (#161755) + +------------------------------------------------------------------- Old: ---- yast2-bootloader-2.13.36.tar.bz2 New: ---- yast2-bootloader-2.13.37.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-bootloader.spec ++++++ --- /var/tmp/diff_new_pack.nQX0cB/_old 2006-04-05 01:45:33.000000000 +0200 +++ /var/tmp/diff_new_pack.nQX0cB/_new 2006-04-05 01:45:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-bootloader (Version 2.13.36) +# spec file for package yast2-bootloader (Version 2.13.37) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-bootloader -Version: 2.13.36 +Version: 2.13.37 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-bootloader-2.13.36.tar.bz2 +Source0: yast2-bootloader-2.13.37.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxslt limal-bootloader limal-devel perl-XML-Writer perl-gettext sgml-skel swig update-alternatives update-desktop-files yast2-devel yast2-devtools yast2-installation yast2-perl-bindings yast2-testsuite PreReq: /bin/sed %fillup_prereq @@ -60,7 +60,7 @@ Dan Meszaros %prep -%setup -n yast2-bootloader-2.13.36 +%setup -n yast2-bootloader-2.13.37 %build %{prefix}/bin/y2tool y2autoconf @@ -111,6 +111,13 @@ /usr/share/YaST2/clients/bootfloppy.ycp %changelog -n yast2-bootloader +* Wed Apr 05 2006 - od(a)suse.de +- use empty string when no prep boot or FAT partition is found + (#163387) +- 2.13.37 +* Tue Apr 04 2006 - jplack(a)suse.de +- update list of possible selections, each time a generic widget is + "called" (#161755) * Mon Apr 03 2006 - od(a)suse.de - do not add kernel option "selinux=0" on any architecture (#155856) - fixed compilation errors in lib_iface.ycp ++++++ yast2-bootloader-2.13.36.tar.bz2 -> yast2-bootloader-2.13.37.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.36/VERSION new/yast2-bootloader-2.13.37/VERSION --- old/yast2-bootloader-2.13.36/VERSION 2006-04-03 20:51:24.000000000 +0200 +++ new/yast2-bootloader-2.13.37/VERSION 2006-04-05 01:21:02.000000000 +0200 @@ -1 +1 @@ -2.13.36 +2.13.37 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.36/src/generic/widget_funcs.ycp new/yast2-bootloader-2.13.37/src/generic/widget_funcs.ycp --- old/yast2-bootloader-2.13.36/src/generic/widget_funcs.ycp 2006-02-13 04:52:14.000000000 +0100 +++ new/yast2-bootloader-2.13.37/src/generic/widget_funcs.ycp 2006-04-05 01:01:13.000000000 +0200 @@ -11,7 +11,7 @@ * Authors: * Joachim Plack <jplack(a)suse.de> * - * $Id: widget_funcs.ycp 27748 2006-02-08 15:15:11Z jplack $ + * $Id: widget_funcs.ycp 29669 2006-04-04 15:09:35Z jplack $ * */ @@ -196,11 +196,20 @@ map<string,any>data ) { foreach (string key, any value, options, { - list val = splitstring((string)value, ":"); + list<string> val = splitstring((string)value, ":"); value = val[0]:"undef"; string key_e = key + "_enabled"; boolean enabled_exists = UI::WidgetExists(`id(key_e)); + if ((value == "select") || (value == "multi")) { + val[0] = nil; val[1] = nil; val[2] = nil; + val = filter(string v, val, ``(v!=nil) ); + // update list of possible selections + UI::ChangeWidget (`id (key), `Items, + maplist(string v, val, ``( `item(`id(v), v ) )) + ); + } + if (!haskey (data, key)) { if (enabled_exists) { UI::ChangeWidget (`id (key_e), `Value, false); @@ -215,7 +224,7 @@ UI::ChangeWidget (`id (key), `Value, data[key]:"" == "true" ? true : false); } - else if ((value == "string") || (value == "path") || (value == "select")) { + else if (contains(["string", "path", "select"], (string)value)) { UI::ChangeWidget (`id (key), `Value, data[key]:""); } else if (value == "multi") { @@ -310,3 +319,13 @@ } } // include end + +/* + * Local variables: + * mode: ycp + * mode: font-lock + * mode: auto-fill + * indent-level: 4 + * fill-column: 78 + * End: + */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-bootloader-2.13.36/src/modules/BootPOWERLILO.ycp new/yast2-bootloader-2.13.37/src/modules/BootPOWERLILO.ycp --- old/yast2-bootloader-2.13.36/src/modules/BootPOWERLILO.ycp 2006-04-03 20:40:51.000000000 +0200 +++ new/yast2-bootloader-2.13.37/src/modules/BootPOWERLILO.ycp 2006-04-05 01:20:58.000000000 +0200 @@ -14,7 +14,7 @@ * Joachim Plack <jplack(a)suse.de> * Olaf Dabrunz <od(a)suse.de> * - * $Id: BootPOWERLILO.ycp 29645 2006-04-03 18:20:32Z jplack $ + * $Id: BootPOWERLILO.ycp 29685 2006-04-04 23:20:54Z odabrunz $ * */ @@ -45,7 +45,7 @@ // partition number for the bootloader (either 41PReP boot or Apple_HFS) // start with disabled value and let the partition scanner find a match. -global string prep_boot_partition = "/dev/null"; +global string prep_boot_partition = ""; // map available of 41 PReP partitions, used on iSeries and CHRP global list<string> prep_boot_partitions = []; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit kernel-source
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package kernel-source checked in at Wed Apr 5 01:22:09 CEST 2006. -------- --- kernel-source/kernel-bigsmp.changes 2006-04-04 15:47:45.000000000 +0200 +++ /work/users/ro/STABLE/kernel-source/kernel-bigsmp.changes 2006-04-05 01:05:23.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Apr 4 16:32:24 CEST 2006 - hare(a)suse.de + +- Update configs for S/390. + +------------------------------------------------------------------- kernel-debug.changes: same change kernel-default.changes: same change kernel-dummy.changes: same change kernel-iseries64.changes: same change kernel-kdump.changes: same change kernel-ppc64.changes: same change kernel-s390.changes: same change kernel-smp.changes: same change kernel-source.changes: same change kernel-syms.changes: same change kernel-um.changes: same change kernel-xen.changes: same change kernel-xenpae.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kernel-bigsmp.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 13 +Release: 14 Summary: Kernel with Multiprocessor Support and PAE License: GPL Group: System/Kernel @@ -441,6 +441,8 @@ %files -f kernel.files %changelog -n kernel-bigsmp +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices kernel-debug.spec: same change kernel-default.spec: same change ++++++ kernel-dummy.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -17,7 +17,7 @@ Summary: Internal dummy package for synchronizing release numbers Group: System/Kernel Version: 2.6.16 -Release: 13 +Release: 14 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -40,6 +40,8 @@ /etc/dummy %changelog -n kernel-dummy +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-iseries64.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 12 +Release: 13 Summary: 64-Bit Kernel for iSeries License: GPL Group: System/Kernel @@ -442,6 +442,8 @@ %files -f kernel.files %changelog -n kernel-iseries64 +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-kdump.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 13 +Release: 14 Summary: kernel for kdump License: GPL Group: System/Kernel @@ -451,6 +451,8 @@ %files -f kernel.files %changelog -n kernel-kdump +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-ppc64.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -20,7 +20,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 12 +Release: 13 Summary: Kernel for ppc64 Systems License: GPL, LGPL Group: System/Kernel @@ -456,6 +456,8 @@ %files -f kernel.files %changelog -n kernel-ppc64 +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-s390.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 12 +Release: 13 Summary: The Standard Kernel License: GPL Group: System/Kernel @@ -439,6 +439,8 @@ %files -f kernel.files %changelog -n kernel-s390 +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-smp.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 13 +Release: 14 Summary: Kernel with Multiprocessor Support License: GPL Group: System/Kernel @@ -450,6 +450,8 @@ %files -f kernel.files %changelog -n kernel-smp +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-source.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -25,7 +25,7 @@ %endif PreReq: /sbin/insserv /usr/bin/grep /bin/sed /bin/uname /bin/mkdir /bin/cat /bin/ln /bin/rm /etc/rc.status Version: 2.6.16 -Release: 13 +Release: 14 Source0: http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 Source1: functions.sh Source2: source-post.sh @@ -273,6 +273,8 @@ %files -f kernel-source.files %changelog -n kernel-source +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-syms.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:08.000000000 +0200 @@ -49,7 +49,7 @@ Summary: Kernel Symbol Versions (modversions) Group: Development/Sources Version: 2.6.16 -Release: 13 +Release: 14 Requires: linux Requires: kernel-source = 2.6.16-%release Source11: arch-symbols @@ -127,6 +127,8 @@ /boot/symsets-*-*.tar.gz %changelog -n kernel-syms +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices ++++++ kernel-um.spec ++++++ --- /var/tmp/diff_new_pack.Zx4ARV/_old 2006-04-05 01:20:09.000000000 +0200 +++ /var/tmp/diff_new_pack.Zx4ARV/_new 2006-04-05 01:20:09.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: python %endif Version: 2.6.16 -Release: 13 +Release: 14 Summary: The User Mode Linux kernel. License: GPL Group: System/Kernel @@ -442,6 +442,8 @@ %files -f kernel.files %changelog -n kernel-um +* Tue Apr 04 2006 - hare(a)suse.de +- Update configs for S/390. * Tue Apr 04 2006 - garloff(a)suse.de - Xen configurations: Build backend/frontend drivers as modules. - patches.suse/scsi-scan-tolerate-pq3-[123]: Handle scsi devices kernel-xen.spec: same change kernel-xenpae.spec: same change ++++++ config.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/default new/config/s390/default --- old/config/s390/default 2006-04-03 13:31:30.000000000 +0200 +++ new/config/s390/default 2006-04-05 00:49:28.000000000 +0200 @@ -61,7 +61,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -559,6 +558,7 @@ CONFIG_DASD_ECKD=m CONFIG_DASD_FBA=m CONFIG_DASD_DIAG=m +CONFIG_DASD_EER=y CONFIG_DASD_CMB=m CONFIG_ATA_OVER_ETH=m diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/config/s390/s390 new/config/s390/s390 --- old/config/s390/s390 2006-04-03 13:31:30.000000000 +0200 +++ new/config/s390/s390 2006-04-05 00:49:28.000000000 +0200 @@ -62,7 +62,6 @@ CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y -CONFIG_OBSOLETE_MODPARM=y CONFIG_MODVERSIONS=y CONFIG_MODULE_SRCVERSION_ALL=y CONFIG_KMOD=y @@ -555,6 +554,7 @@ CONFIG_DASD_ECKD=m CONFIG_DASD_FBA=m CONFIG_DASD_DIAG=m +CONFIG_DASD_EER=y CONFIG_DASD_CMB=m CONFIG_ATA_OVER_ETH=m ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit apparmor-profiles
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package apparmor-profiles checked in at Wed Apr 5 01:07:14 CEST 2006. -------- --- apparmor-profiles/apparmor-profiles.changes 2006-04-03 05:58:53.000000000 +0200 +++ apparmor-profiles/apparmor-profiles.changes 2006-04-04 22:11:34.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 4 22:11:10 CEST 2006 - srarnold(a)suse.de + +- Fix for postfix/sasl (#159667) +- Fix for NIS/portmapper nameservice capabilities + +------------------------------------------------------------------- Old: ---- apparmor-profiles-2.0-6364.tar.gz New: ---- apparmor-profiles-2.0-6366.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apparmor-profiles.spec ++++++ --- /var/tmp/diff_new_pack.blSyVK/_old 2006-04-05 01:06:23.000000000 +0200 +++ /var/tmp/diff_new_pack.blSyVK/_new 2006-04-05 01:06:23.000000000 +0200 @@ -16,9 +16,9 @@ %endif Summary: AppArmor profiles that are loaded into the apparmor kernel module Version: 2.0 -Release: 18 +Release: 19 Group: Productivity/Security -Source0: %{name}-%{version}-6364.tar.gz +Source0: %{name}-%{version}-6366.tar.gz License: Other License(s), see package, GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -77,6 +77,9 @@ %preun %changelog -n apparmor-profiles +* Tue Apr 04 2006 - srarnold(a)suse.de +- Fix for postfix/sasl (#159667) +- Fix for NIS/portmapper nameservice capabilities * Mon Apr 03 2006 - dreynolds(a)suse.de - Fix for postalias (#158689) - a profile update for svnserve ++++++ apparmor-profiles-2.0-6364.tar.gz -> apparmor-profiles-2.0-6366.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0/abstractions/nameservice new/apparmor-profiles-2.0/abstractions/nameservice --- old/apparmor-profiles-2.0/abstractions/nameservice 2006-02-09 19:43:32.000000000 +0100 +++ new/apparmor-profiles-2.0/abstractions/nameservice 2006-04-04 22:08:41.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: nameservice 6242 2006-02-07 07:52:24Z sarnold $ +# $Id: nameservice 6366 2006-04-04 20:08:39Z sarnold $ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE @@ -45,6 +45,8 @@ # NIS rules /var/yp/binding/* r, + # portmapper may ask root processes to do nis/ldap at low ports + capability net_bind_service, # pam_winbindd /tmp/.winbindd/pipe rw, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0/apparmor-profiles.spec new/apparmor-profiles-2.0/apparmor-profiles.spec --- old/apparmor-profiles-2.0/apparmor-profiles.spec 2006-04-03 06:00:16.000000000 +0200 +++ new/apparmor-profiles-2.0/apparmor-profiles.spec 2006-04-04 22:08:53.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor-profiles.spec.in 6351 2006-03-30 23:15:03Z dominic $ +# $Id: apparmor-profiles.spec.in 6366 2006-04-04 20:08:39Z sarnold $ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE @@ -24,9 +24,9 @@ Summary: AppArmor profiles Name: apparmor-profiles Version: 2.0 -Release: 10.1 +Release: 11.1 Group: Productivity/Security -Source0: %{name}-%{version}-6364.tar.gz +Source0: %{name}-%{version}-6366.tar.gz License: GPL BuildRoot: %{?_tmppath:}%{!?_tmppath:/var/tmp}/%{name}-%{version}-build Url: http://forge.novell.com/modules/xfmod/project/?apparmor @@ -78,6 +78,9 @@ %preun %changelog +* Mon Apr 3 2006 Seth Arnold <seth.arnold(a)suse.de> 2.0-11.1 +- Fix for postfix/sasl (#159667) +- Fix for NIS/portmapper nameservice capabilities * Thu Mar 30 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-10.1 - Fix for postalias (#158689) * Sun Mar 12 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-10.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0/apparmor-profiles.spec.in new/apparmor-profiles-2.0/apparmor-profiles.spec.in --- old/apparmor-profiles-2.0/apparmor-profiles.spec.in 2006-03-31 01:13:36.000000000 +0200 +++ new/apparmor-profiles-2.0/apparmor-profiles.spec.in 2006-04-04 22:08:41.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: apparmor-profiles.spec.in 6351 2006-03-30 23:15:03Z dominic $ +# $Id: apparmor-profiles.spec.in 6366 2006-04-04 20:08:39Z sarnold $ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE @@ -24,7 +24,7 @@ Summary: AppArmor profiles Name: apparmor-profiles Version: @@immunix_version@@ -Release: 10.1 +Release: 11.1 Group: Productivity/Security Source0: %{name}-%{version}-@@repo_version@@.tar.gz License: GPL @@ -78,6 +78,9 @@ %preun %changelog +* Mon Apr 3 2006 Seth Arnold <seth.arnold(a)suse.de> 2.0-11.1 +- Fix for postfix/sasl (#159667) +- Fix for NIS/portmapper nameservice capabilities * Thu Mar 30 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-10.1 - Fix for postalias (#158689) * Sun Mar 12 2006 Dominic Reynolds <dreynolds(a)suse.de> 2.0-10.1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0/program-chunks/postfix-common new/apparmor-profiles-2.0/program-chunks/postfix-common --- old/apparmor-profiles-2.0/program-chunks/postfix-common 2006-03-10 00:12:40.000000000 +0100 +++ new/apparmor-profiles-2.0/program-chunks/postfix-common 2006-04-04 22:08:41.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: postfix-common 6307 2006-03-09 19:27:46Z sarnold $ +# $Id: postfix-common 6366 2006-04-04 20:08:39Z sarnold $ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE @@ -17,3 +17,7 @@ /etc/postfix/*.cf r, /proc/net/if_inet6 r, /usr/lib/postfix/*.so r, + /usr/lib64/sasl2/* r, + /usr/lib64/sasl2 r, + /usr/lib/sasl2/* r, + /usr/lib/sasl2 r, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0/programs-enabled/files new/apparmor-profiles-2.0/programs-enabled/files --- old/apparmor-profiles-2.0/programs-enabled/files 2006-01-27 02:14:42.000000000 +0100 +++ new/apparmor-profiles-2.0/programs-enabled/files 1970-01-01 01:00:00.000000000 +0100 @@ -1,80 +0,0 @@ -bin.netstat -bin.ping -bin.traceroute -etc.cron.daily.logrotate -etc.cron.daily.slocate.cron -etc.cron.daily.tmpwatch -lib.ld-2.2.so -opt.gnome.bin.evolution-2.4 -opt.gnome.bin.gaim -opt.gnome.lib.bonobo.bonobo-activation-server -opt.gnome.lib.evolution-data-server-1.2.evolution-data-server-1.4 -opt.gnome.lib.GConf.2.gconfd-2 -opt.MozillaFirefox.bin.firefox.sh -opt.MozillaFirefox.lib.firefox-bin -opt.MozillaFirefox.lib.mozilla-xremote-client -sbin.dhclient -sbin.dhcpcd -sbin.klogd -sbin.portmap -sbin.rpc.lockd -sbin.rpc.statd -sbin.syslogd -usr.bin.apropos -usr.bin.fam -usr.bin.ldd -usr.bin.man -usr.bin.opera -usr.bin.procmail -usr.bin.spamc -usr.lib.man-db.man -usr.lib.postfix.bounce -usr.lib.postfix.cleanup -usr.lib.postfix.flush -usr.lib.postfix.local -usr.lib.postfix.master -usr.lib.postfix.nqmgr -usr.lib.postfix.pickup -usr.lib.postfix.proxymap -usr.lib.postfix.qmgr -usr.lib.postfix.scache -usr.lib.postfix.showq -usr.lib.postfix.smtp -usr.lib.postfix.smtpd -usr.lib.postfix.tlsmgr -usr.lib.postfix.trivial-rewrite -usr.lib.RealPlayer10.realplay -usr.sbin.dhcpd -usr.sbin.httpd -usr.sbin.httpd2-prefork -usr.sbin.identd -usr.sbin.imapd -usr.sbin.in.fingerd -usr.sbin.in.ftpd -usr.sbin.in.ntalkd -usr.sbin.ipop2d -usr.sbin.ipop3d -usr.sbin.mysqld -usr.sbin.named -usr.sbin.nmbd -usr.sbin.nscd -usr.sbin.ntpd -usr.sbin.postalias -usr.sbin.postdrop -usr.sbin.postmap -usr.sbin.postqueue -usr.sbin.sendmail -usr.sbin.sendmail.postfix -usr.sbin.sendmail.sendmail -usr.sbin.slapd -usr.sbin.smbd -usr.sbin.spamd -usr.sbin.squid -usr.sbin.sshd -usr.sbin.useradd -usr.sbin.userdel -usr.sbin.vsftpd -usr.sbin.xinetd -usr.X11R6.bin.acroread -usr.X11R6.bin.ethereal -usr.X11R6.bin.xfs diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0/programs-enabled/test.sh new/apparmor-profiles-2.0/programs-enabled/test.sh --- old/apparmor-profiles-2.0/programs-enabled/test.sh 2006-01-27 02:27:38.000000000 +0100 +++ new/apparmor-profiles-2.0/programs-enabled/test.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,8 +0,0 @@ -#!/bin/bash - -for file in `cat files` -do - echo " sed "s/syntax=subdomain/syntax=apparmor/g"< $file > $file.tmp" - sed "s/syntax=subdomain/syntax=apparmor/g" < $file > $file.tmp - mv $file.tmp $file -done diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/apparmor-profiles-2.0/programs-enabled/usr.lib.postfix.qmgr new/apparmor-profiles-2.0/programs-enabled/usr.lib.postfix.qmgr --- old/apparmor-profiles-2.0/programs-enabled/usr.lib.postfix.qmgr 2006-02-07 06:07:00.000000000 +0100 +++ new/apparmor-profiles-2.0/programs-enabled/usr.lib.postfix.qmgr 1970-01-01 01:00:00.000000000 +0100 @@ -1,54 +0,0 @@ -# $Id: usr.lib.postfix.qmgr 6201 2006-02-02 21:10:54Z sarnold $ -# ------------------------------------------------------------------ -# -# Copyright (C) 2002-2006 Novell/SUSE -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2 of the GNU General Public -# License published by the Free Software Foundation. -# -# ------------------------------------------------------------------ - - -/usr/lib/postfix/qmgr { - #include <abstractions/base> - #include <abstractions/kerberosclient> - #include <abstractions/nameservice> - #include <program-chunks/postfix-common> - - /usr/lib/postfix/qmgr rix, - /proc/sys/kernel/ngroups_max r, - /tmp/.winbindd/pipe w, - /{var/spool/postfix/,}active r, - /{var/spool/postfix/,}active/[0-9A-F] r, - /{var/spool/postfix/,}active/[0-9A-F]/[0-9A-F] rwl, - /{var/spool/postfix/,}active/[0-9A-F]/[0-9A-F]/* rwl, - /{var/spool/postfix/,}active/[0-9A-F]/[0-9A-F]* rwl, - /{var/spool/postfix/,}active/[0-9A-F]* rwl, - /{var/spool/postfix/,}defer r, - /{var/spool/postfix/,}defer/[0-9A-F] r, - /{var/spool/postfix/,}defer/[0-9A-F]/[0-9A-F] rwl, - /{var/spool/postfix/,}defer/[0-9A-F]/[0-9A-F]/* rwl, - /{var/spool/postfix/,}defer/[0-9A-F]/[0-9A-F]* rwl, - /{var/spool/postfix/,}defer/[0-9A-F]* rwl, - /{var/spool/postfix/,}deferred r, - /{var/spool/postfix/,}deferred/[0-9A-F] r, - /{var/spool/postfix/,}deferred/[0-9A-F]/[0-9A-F] r, - /{var/spool/postfix/,}deferred/[0-9A-F]/[0-9A-F]/* rwl, - /{var/spool/postfix/,}deferred/[0-9A-F]/[0-9A-F]* rwl, - /{var/spool/postfix/,}deferred/[0-9A-F]* rwl, - /{var/spool/postfix/,}incoming r, - /{var/spool/postfix/,}incoming/[0-9A-F] r, - /{var/spool/postfix/,}incoming/[0-9A-F]/[0-9A-F] r, - /{var/spool/postfix/,}incoming/[0-9A-F]/[0-9A-F]/* rwl, - /{var/spool/postfix/,}incoming/[0-9A-F]/[0-9A-F]* rwl, - /{var/spool/postfix/,}incoming/[0-9A-F]* rwl, - /{var/spool/postfix/,}public/qmgr r, - /{var/spool/postfix/,}private/bounce w, - /{var/spool/postfix/,}private/defer w, - /{var/spool/postfix/,}private/local w, - /{var/spool/postfix/,}private/relay w, - /{var/spool/postfix/,}private/rewrite w, - /{var/spool/postfix/,}private/smtp w, - /{var/spool/postfix/,}private/trace w, -} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zmd
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package zmd checked in at Wed Apr 5 01:06:08 CEST 2006. -------- --- zmd/zmd.changes 2006-04-01 00:15:34.000000000 +0200 +++ zmd/zmd.changes 2006-04-04 19:51:53.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 4 18:45:42 CEST 2006 - maw(a)suse.de + +- New source drop (r26656) which: +- Has an updated copyright string in Daemon Health +- Implements a service helper for service remover. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zmd.spec ++++++ --- /var/tmp/diff_new_pack.Acsslb/_old 2006-04-05 01:05:45.000000000 +0200 +++ /var/tmp/diff_new_pack.Acsslb/_new 2006-04-05 01:05:45.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: dbus-1-mono log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser rpm-devel sqlite-devel URL: http://www.novell.com Version: 7.1.1 -Release: 36 +Release: 37 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-7.1.1.tar.bz2 @@ -156,6 +156,10 @@ # %{_libdir}/monodoc/sources/* %changelog -n zmd +* Tue Apr 04 2006 - maw(a)suse.de +- New source drop (r26656) which: +- Has an updated copyright string in Daemon Health +- Implements a service helper for service remover. * Fri Mar 31 2006 - maw(a)suse.de - New source drop (r26565) which: - Reverts lots of brokenness ++++++ zmd-7.1.1.tar.bz2 ++++++ ++++ 11938 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/ChangeLog new/zmd-7.1.1/modules/ChangeLog --- old/zmd-7.1.1/modules/ChangeLog 2006-03-31 18:52:53.000000000 +0200 +++ new/zmd-7.1.1/modules/ChangeLog 2006-04-04 16:58:27.000000000 +0200 @@ -1,3 +1,49 @@ +2006-04-04 Dan Mills <thunder(a)ximian.com> + + * linux/Backend.cs: + * linux/RedCarpetBackend.cs: + + Implement a "service-delete helper". + + * linux/ZyppService.cs: + * linux/YumService.cs: + * linux/NUService.cs: + + Call Backend.Current.ServiceDelete when the service is being + removed. + + * linux/ResolvableBase.cs (ReadDependencies): + * linux/SqlPackage.cs (ReadDependencies): + + Parse the dep_target column. + + * linux/SharedInterfaces.cs (ResolvableType): Add more dependency + target types. + +2006-04-03 Dan Mills <thunder(a)ximian.com> + + * linux/ResolvableBase.cs: Implement a new abstract class, + ResolvableBaseDB, which inherits from ResolvableBase but + implements the auto-getting of dependency information also in + SqlPackage.cs (which derives from Package, so it's there still). + + * linux/Message.cs: + * linux/Product.cs: + * linux/Patch.cs: + * linux/Script.cs: + * linux/Pattern.cs: + * linux/ResolvableQuery.cs (Dep): + + Derive from ResolvableBaseDB. + + * linux/SharedInterfaces.cs: PackageDepsInfo -> + ResolvableDepsInfo, since we use it for resolvables in general + now. Add the ResolvableType to DepInfo. + + * linux/RemotePackageManager.cs: PackageDepsInfo -> + ResolvableDepsInfo, and implement a GetPatchDependencyInfo call + for the client. + 2006-03-31 Tambet Ingo <tambet(a)ximian.com> * linux/ResolvableBase.cs: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Backend.cs new/zmd-7.1.1/modules/linux/Backend.cs --- old/zmd-7.1.1/modules/linux/Backend.cs 2006-03-30 22:36:23.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/Backend.cs 2006-04-04 16:58:27.000000000 +0200 @@ -28,6 +28,8 @@ public abstract void ParseMetadata (string type, string path, Catalog catalog); + public abstract void ServiceDelete (); + public abstract ResolverResult ResolveDependencies (IResolvable[] installs, IResolvable[] upgrades, IResolvable[] removals); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Message.cs new/zmd-7.1.1/modules/linux/Message.cs --- old/zmd-7.1.1/modules/linux/Message.cs 2006-02-14 00:39:00.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/Message.cs 2006-04-03 20:04:03.000000000 +0200 @@ -5,7 +5,7 @@ namespace Novell.Zenworks.Zmd.Packaging { - public class Message : ResolvableBase { + public class Message : ResolvableBaseDB { private string content; public string Content { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/NUService.cs new/zmd-7.1.1/modules/linux/NUService.cs --- old/zmd-7.1.1/modules/linux/NUService.cs 2006-03-09 23:13:53.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/NUService.cs 2006-04-04 16:58:27.000000000 +0200 @@ -99,6 +99,7 @@ if (!disposed) { if (disposing) { Remove (); + Backend.Current.ServiceDelete (); } disposed = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Patch.cs new/zmd-7.1.1/modules/linux/Patch.cs --- old/zmd-7.1.1/modules/linux/Patch.cs 2006-03-28 03:10:57.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/Patch.cs 2006-04-03 20:04:03.000000000 +0200 @@ -7,7 +7,7 @@ namespace Novell.Zenworks.Zmd.Packaging { - public class Patch : ResolvableBase { + public class Patch : ResolvableBaseDB { private string patchId; private DateTime creationTime; private bool rebootRequired; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Pattern.cs new/zmd-7.1.1/modules/linux/Pattern.cs --- old/zmd-7.1.1/modules/linux/Pattern.cs 2006-03-28 03:10:57.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/Pattern.cs 2006-04-03 20:04:03.000000000 +0200 @@ -5,7 +5,7 @@ namespace Novell.Zenworks.Zmd.Packaging { - public class Pattern : ResolvableBase { + public class Pattern : ResolvableBaseDB { private static ResolvableQuery engine = new ResolvableQuery (typeof (Pattern)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Product.cs new/zmd-7.1.1/modules/linux/Product.cs --- old/zmd-7.1.1/modules/linux/Product.cs 2006-03-28 03:10:57.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/Product.cs 2006-04-03 20:04:03.000000000 +0200 @@ -5,7 +5,7 @@ namespace Novell.Zenworks.Zmd.Packaging { - public class Product : ResolvableBase { + public class Product : ResolvableBaseDB { private static ResolvableQuery engine = new ResolvableQuery (typeof (Product)); public static IEnumerable Query (IList query) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/RedCarpetBackend.cs new/zmd-7.1.1/modules/linux/RedCarpetBackend.cs --- old/zmd-7.1.1/modules/linux/RedCarpetBackend.cs 2006-03-28 03:10:57.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/RedCarpetBackend.cs 2006-04-04 16:58:27.000000000 +0200 @@ -218,6 +218,16 @@ } } + public override void ServiceDelete () { + try { + Database.GetLock (false); + RCProgress progress = new RCProgress (Path.Combine (prefix, "service-delete"), ""); + progress.WaitForStop (); + } finally { + Database.ReleaseLock (false); + } + } + public override Package[] FindFile (string file) { Int64[] ids = null; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/RemotePackageManager.cs new/zmd-7.1.1/modules/linux/RemotePackageManager.cs --- old/zmd-7.1.1/modules/linux/RemotePackageManager.cs 2006-03-28 03:10:57.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/RemotePackageManager.cs 2006-04-03 20:04:03.000000000 +0200 @@ -30,8 +30,8 @@ using Novell.Zenworks.Zmd.Public; using Novell.Zenworks.Zmd.Packaging.Public; using Novell.Zenworks.Utility; - using ResolverInfo = Novell.Zenworks.Zmd.Packaging.Public.ResolverInfo; +using log4net; namespace Novell.Zenworks.Zmd.Packaging { @@ -108,6 +108,7 @@ public class RemotePackageManager : MarshalByRefObject, IPackageManager { + private static readonly ILog log = LogManager.GetLogger (typeof (RemotePackageManager)); private static Hashtable refs = new Hashtable (); [Privilege ("view")] @@ -162,12 +163,12 @@ } [Privilege ("view")] - public PackageDepsInfo GetPackageDependencyInfo (PackageInfo info) { + public ResolvableDepsInfo GetPackageDependencyInfo (PackageInfo info) { Package pkg = GetPackage (info); if (pkg == null) - return PackageDepsInfo.Empty; + return ResolvableDepsInfo.Empty; - PackageDepsInfo ret = new PackageDepsInfo (); + ResolvableDepsInfo ret = new ResolvableDepsInfo (); ret.Provides = GetDepInfoArray (pkg.Provides); ret.Requires = GetDepInfoArray (pkg.Requires); @@ -407,6 +408,21 @@ } [Privilege ("view")] + public ResolvableDepsInfo GetPatchDependencyInfo (PatchInfo info) { + Patch patch = GetPatch (info); + if (patch == null) + return ResolvableDepsInfo.Empty; + + ResolvableDepsInfo ret = new ResolvableDepsInfo (); + ret.Provides = GetDepInfoArray (patch.Provides); + ret.Requires = GetDepInfoArray (patch.Requires); + ret.Conflicts = GetDepInfoArray (patch.Conflicts); + ret.Obsoletes = GetDepInfoArray (patch.Obsoletes); + + return ret; + } + + [Privilege ("view")] public ResolvableInfo[] GetPatterns () { return GetPatterns (null); } @@ -734,6 +750,7 @@ ResolvableDep dep = ResolvableDep.VersionFromString (info.Version); dep.Name = info.Name; dep.Operation = ResolvableDep.OperationFromString (info.Relation); + dep.Target = info.Target; return dep; } @@ -746,11 +763,15 @@ info.Name = dep.Name; info.Version = dep.VersionToString (); info.Relation = ResolvableDep.OperationToString (dep.Operation); + info.Target = dep.Target; return info; } private static DepInfo[] GetDepInfoArray (IEnumerable input) { + if (input == null) + return new DepInfo[0]; + ArrayList list = new ArrayList (); foreach (ResolvableDep dep in input) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/ResolvableBase.cs new/zmd-7.1.1/modules/linux/ResolvableBase.cs --- old/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-03-31 18:52:53.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/ResolvableBase.cs 2006-04-04 16:58:27.000000000 +0200 @@ -144,4 +144,57 @@ resolvable.category = reader.GetString (offset + 11); } } + + public abstract class ResolvableBaseDB : ResolvableBase { + public override ICollection Requires { + get { return ReadDependencies (SqlDep.Require); } + } + + public override ICollection Provides { + get { return ReadDependencies (SqlDep.Provide); } + } + + public override ICollection Conflicts { + get { return ReadDependencies (SqlDep.Conflict); } + } + + public override ICollection Obsoletes { + get { return ReadDependencies (SqlDep.Obsolete); } + } + + private ResolvableDep[] ReadDependencies (SqlDep type) { + string query = String.Format ("SELECT name, version, release, epoch, arch, relation, dep_target " + + "FROM dependencies " + + "WHERE resolvable_id = {0} AND dep_type = {1}", + id, (int) type); + + ResolvableDepCollection deps = new ResolvableDepCollection (); + + IDbCommand command = Database.Connection.CreateCommand (); + command.CommandText = query; + Database.GetLock (true); + + try { + IDataReader reader = command.ExecuteReader (); + while (reader.Read ()) { + ResolvableDep dep = new ResolvableDep (); + + dep.Name = reader.GetString (0); + dep.Epoch = reader.GetInt32 (3); + dep.Version = reader.GetString (1); + dep.Release = reader.GetString (2); + dep.Arch = (Arch) reader.GetInt32 (4); + dep.Operation = (ResolvableOperation) reader.GetInt32 (5); + dep.Target = (ResolvableType) reader.GetInt32 (6); + + deps.Add (dep); + } + } finally { + Database.ReleaseLock (true); + command.Dispose (); + } + + return deps.ToArray (); + } + } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/ResolvableQuery.cs new/zmd-7.1.1/modules/linux/ResolvableQuery.cs --- old/zmd-7.1.1/modules/linux/ResolvableQuery.cs 2006-03-28 03:10:57.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/ResolvableQuery.cs 2006-04-03 20:04:03.000000000 +0200 @@ -158,7 +158,7 @@ } } - private class Dep : ResolvableBase { + private class Dep : ResolvableBaseDB { private ResolvableDep dep; public Dep () { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/Script.cs new/zmd-7.1.1/modules/linux/Script.cs --- old/zmd-7.1.1/modules/linux/Script.cs 2006-02-14 00:39:00.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/Script.cs 2006-04-03 20:04:03.000000000 +0200 @@ -5,7 +5,7 @@ namespace Novell.Zenworks.Zmd.Packaging { - public class Script : ResolvableBase { + public class Script : ResolvableBaseDB { private string doScript; private string undoScript; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/SharedInterfaces.cs new/zmd-7.1.1/modules/linux/SharedInterfaces.cs --- old/zmd-7.1.1/modules/linux/SharedInterfaces.cs 2006-03-28 03:10:57.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/SharedInterfaces.cs 2006-04-04 16:58:27.000000000 +0200 @@ -67,7 +67,7 @@ string[] FileList (PackageInfo pkg); - PackageDepsInfo GetPackageDependencyInfo (PackageInfo pkg); + ResolvableDepsInfo GetPackageDependencyInfo (PackageInfo pkg); PackageInfo[] FindPackageForFile (string filename); @@ -123,6 +123,7 @@ PatchInfo GetLatestPatch (string name, bool subscribedOnly); PatchInfo[] GetPatchUpdates (); PatchInfo[] GetPatchUpdates (CatalogInfo info); + ResolvableDepsInfo GetPatchDependencyInfo (PatchInfo patch); // Patterns ResolvableInfo[] GetPatterns (); @@ -168,7 +169,11 @@ Message = 2, Patch = 3, Pattern = 4, - Product = 5 + Product = 5, + Selection = 6, + Language = 7, + Atom = 8, + SrcPackage = 9 } public enum ResolvableStatus { @@ -250,18 +255,19 @@ public string Name; public string Version; public string Relation; + public ResolvableType Target; public static DepInfo Empty = new DepInfo (); } [Serializable] - public struct PackageDepsInfo { + public struct ResolvableDepsInfo { public DepInfo[] Provides; public DepInfo[] Requires; public DepInfo[] Conflicts; public DepInfo[] Obsoletes; - public static PackageDepsInfo Empty = new PackageDepsInfo (); + public static ResolvableDepsInfo Empty = new ResolvableDepsInfo (); } [Serializable] diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/SqlPackage.cs new/zmd-7.1.1/modules/linux/SqlPackage.cs --- old/zmd-7.1.1/modules/linux/SqlPackage.cs 2006-03-31 18:52:53.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/SqlPackage.cs 2006-04-04 16:58:27.000000000 +0200 @@ -3,6 +3,7 @@ using Mono.Data.SqliteClient; using System.Collections; using Novell.Zenworks.Zmd.Public; +using Novell.Zenworks.Zmd.Packaging.Public; namespace Novell.Zenworks.Zmd.Packaging { @@ -35,7 +36,7 @@ } private ResolvableDep[] ReadDependencies (SqlDep type) { - string query = String.Format ("SELECT name, version, release, epoch, arch, relation " + + string query = String.Format ("SELECT name, version, release, epoch, arch, relation, dep_target " + "FROM dependencies " + "WHERE resolvable_id = {0} AND dep_type = {1}", id, (int) type); @@ -57,6 +58,7 @@ dep.Release = reader.GetString (2); dep.Arch = (Arch) reader.GetInt32 (4); dep.Operation = (ResolvableOperation) reader.GetInt32 (5); + dep.Target = (ResolvableType) reader.GetInt32 (6); deps.Add (dep); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/YumService.cs new/zmd-7.1.1/modules/linux/YumService.cs --- old/zmd-7.1.1/modules/linux/YumService.cs 2006-03-30 22:36:23.000000000 +0200 +++ new/zmd-7.1.1/modules/linux/YumService.cs 2006-04-04 16:58:27.000000000 +0200 @@ -94,6 +94,7 @@ if (disposing) { Remove (); RedCarpetBackend.UpdatePatchStatus (); + Backend.Current.ServiceDelete (); } disposed = true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/modules/linux/ZyppService.cs new/zmd-7.1.1/modules/linux/ZyppService.cs --- old/zmd-7.1.1/modules/linux/ZyppService.cs 2006-03-13 17:55:33.000000000 +0100 +++ new/zmd-7.1.1/modules/linux/ZyppService.cs 2006-04-04 16:58:27.000000000 +0200 @@ -78,6 +78,7 @@ if (!disposed) { if (disposing) { Remove (); + Backend.Current.ServiceDelete (); } disposed = true; Binary files old/zmd-7.1.1/po/de_DE.gmo and new/zmd-7.1.1/po/de_DE.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/de_DE.po new/zmd-7.1.1/po/de_DE.po --- old/zmd-7.1.1/po/de_DE.po 2006-03-31 22:44:49.000000000 +0200 +++ new/zmd-7.1.1/po/de_DE.po 2006-04-01 19:59:42.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-31 14:44-0600\n" +"POT-Creation-Date: 2006-04-01 12:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" Binary files old/zmd-7.1.1/po/en_US.gmo and new/zmd-7.1.1/po/en_US.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/en_US.po new/zmd-7.1.1/po/en_US.po --- old/zmd-7.1.1/po/en_US.po 2006-03-31 22:44:49.000000000 +0200 +++ new/zmd-7.1.1/po/en_US.po 2006-04-01 19:59:42.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-31 14:44-0600\n" +"POT-Creation-Date: 2006-04-01 12:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" Binary files old/zmd-7.1.1/po/es_ES.gmo and new/zmd-7.1.1/po/es_ES.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/es_ES.po new/zmd-7.1.1/po/es_ES.po --- old/zmd-7.1.1/po/es_ES.po 2006-03-31 22:44:49.000000000 +0200 +++ new/zmd-7.1.1/po/es_ES.po 2006-04-01 19:59:42.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-31 14:44-0600\n" +"POT-Creation-Date: 2006-04-01 12:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" Binary files old/zmd-7.1.1/po/fr_FR.gmo and new/zmd-7.1.1/po/fr_FR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/fr_FR.po new/zmd-7.1.1/po/fr_FR.po --- old/zmd-7.1.1/po/fr_FR.po 2006-03-31 22:44:49.000000000 +0200 +++ new/zmd-7.1.1/po/fr_FR.po 2006-04-01 19:59:42.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-31 14:44-0600\n" +"POT-Creation-Date: 2006-04-01 12:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" Binary files old/zmd-7.1.1/po/pt_BR.gmo and new/zmd-7.1.1/po/pt_BR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/po/pt_BR.po new/zmd-7.1.1/po/pt_BR.po --- old/zmd-7.1.1/po/pt_BR.po 2006-03-31 22:44:49.000000000 +0200 +++ new/zmd-7.1.1/po/pt_BR.po 2006-04-01 19:59:42.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-31 14:44-0600\n" +"POT-Creation-Date: 2006-04-01 12:59-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <smaher(a)novell.com>\n" "Language-Team: LANGUAGE <language(a)novell.com>\n" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/BuildConfig.cs new/zmd-7.1.1/src/BuildConfig.cs --- old/zmd-7.1.1/src/BuildConfig.cs 2006-03-31 22:44:44.000000000 +0200 +++ new/zmd-7.1.1/src/BuildConfig.cs 2006-04-04 18:38:49.000000000 +0200 @@ -1,14 +1,14 @@ namespace Novell.Zenworks.Zmd { public class BuildConfig { - public const string PREFIX = "/usr/local"; - public const string SYSCONFDIR = "/usr/local/etc"; - public const string DATADIR = "/usr/local/share"; - public const string LIBDIR = "/usr/local/lib"; - public const string LIBDIR_MANAGED = "/usr/local" + "/lib"; - public const string LOCALSTATEDIR = "/usr/local/var"; + public const string PREFIX = "/opt/zypp"; + public const string SYSCONFDIR = "/opt/zypp/etc"; + public const string DATADIR = "/opt/zypp/share"; + public const string LIBDIR = "/opt/zypp/lib"; + public const string LIBDIR_MANAGED = "/opt/zypp" + "/lib"; + public const string LOCALSTATEDIR = "/opt/zypp/var"; - public const string LOGDIR = "/usr/local/var/log"; + public const string LOGDIR = "/opt/zypp/var/log"; public const string LOGFILE = LOGDIR + "/zmd-messages.log"; public const string MODULE_PATH = LIBDIR_MANAGED + "/zmd/modules"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/ChangeLog new/zmd-7.1.1/src/ChangeLog --- old/zmd-7.1.1/src/ChangeLog 2006-03-31 18:52:52.000000000 +0200 +++ new/zmd-7.1.1/src/ChangeLog 2006-04-04 16:58:26.000000000 +0200 @@ -1,3 +1,17 @@ +2006-04-04 Tambet Ingo <tambet(a)ximian.com> + + * DaemonHealth.cs: Update the copyright string we return to "ping" + command. Fixed #162911. + +2006-04-01 Chris Rivera <cmr(a)ximian.com> + + * Makefile.am: add BuildConfig.cs to CLEANFILES + +2006-03-31 James Willcox <james(a)ximian.com> + + * util.c: add signal handling stuff + * UnixSignal.cs: use the unmanaged signal handling bits + 2006-03-31 Tambet Ingo <tambet(a)ximian.com> * Identity.cs (IsWellFormedUsername): Fix a typo, add '-' to the list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/DaemonHealth.cs new/zmd-7.1.1/src/DaemonHealth.cs --- old/zmd-7.1.1/src/DaemonHealth.cs 2006-03-30 22:36:20.000000000 +0200 +++ new/zmd-7.1.1/src/DaemonHealth.cs 2006-04-04 16:58:26.000000000 +0200 @@ -55,7 +55,7 @@ DaemonInfo info; info.Started = start; - info.Version = String.Format ("ZMD {0}.{1}.{2}, Copyright (C) 2005 Novell, Inc.", + info.Version = String.Format ("ZMD {0}.{1}.{2}, Copyright (C) 2006 Novell, Inc.", BuildConfig.MAJOR_VERSION, BuildConfig.MINOR_VERSION, BuildConfig.MICRO_VERSION); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/Makefile.am new/zmd-7.1.1/src/Makefile.am --- old/zmd-7.1.1/src/Makefile.am 2006-03-09 23:13:43.000000000 +0100 +++ new/zmd-7.1.1/src/Makefile.am 2006-04-01 19:51:22.000000000 +0200 @@ -274,6 +274,7 @@ CLEANFILES = \ zmd \ zmd_bin \ + $(srcdir)/BuildConfig.cs \ $(ZMD_ASSEMBLIES) \ $(GAC_ASSEMBLIES) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/Prefs.cs new/zmd-7.1.1/src/Prefs.cs --- old/zmd-7.1.1/src/Prefs.cs 2006-03-30 22:36:20.000000000 +0200 +++ new/zmd-7.1.1/src/Prefs.cs 2006-03-29 02:26:06.000000000 +0200 @@ -564,7 +564,7 @@ this.description = GettextCatalog.GetString ("If true, inventory information will be collected and sent to the server"); this.category = GettextCatalog.GetString ("Server"); this.type = typeof (bool); - this.default_value = (bool) false; + this.default_value = (bool) true; } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/UnixSignal.cs new/zmd-7.1.1/src/UnixSignal.cs --- old/zmd-7.1.1/src/UnixSignal.cs 2006-02-08 21:18:38.000000000 +0100 +++ new/zmd-7.1.1/src/UnixSignal.cs 2006-04-01 19:14:55.000000000 +0200 @@ -33,35 +33,22 @@ namespace Novell.Zenworks.Zmd { public delegate void SignalHandler (Signum sig); - public delegate void SignalRestorer (); - - [StructLayout(LayoutKind.Sequential)] - internal struct SigActionData { - public SignalHandler handler; - public UInt64 flags; - public SignalRestorer restorer; - public UInt64 mask; // The actual struct has one long[2] type here but this works. - public UInt64 mask2; - - public SigActionData (SignalHandler handler) { - this.handler = handler; - flags = 0; - restorer = null; - mask = 0; - mask2 = 0; - } - } public class UnixSignal { private static readonly ILog log = LogManager.GetLogger (typeof (UnixSignal)); - private static bool dummy; - private static Signum lastSignal; + private static SignalHandler handlerRef; private static Hashtable handlers; - [DllImport ("libc")] - private static extern int sigaction (int signum, ref SigActionData action, IntPtr blah); + [DllImport ("zmdutil")] + private static extern void zmd_signal_handler_start (SignalHandler handler); + + [DllImport ("zmdutil")] + private static extern void zmd_signal_handle (Signum sig); + + [DllImport ("zmdutil")] + private static extern void zmd_signal_unhandle (Signum sig); [DllImport ("libc")] private static extern int sigemptyset (IntPtr sigs); @@ -73,48 +60,27 @@ private static extern int pthread_sigmask (int how, IntPtr mask, IntPtr oldmask); static UnixSignal () { - // JIT the handler method now - dummy = true; - InternalHandler (0); - dummy = false; - handlers = new Hashtable (); - Thread eventThread = new Thread (new ThreadStart (SignalEventLoop)); - eventThread.IsBackground = true; - eventThread.Start (); + + handlerRef = new SignalHandler (InternalHandler); + zmd_signal_handler_start (handlerRef); } - private static void SignalEventLoop () { - while (true) { - Thread.Sleep (1000); - - Signum sig = lastSignal; - lastSignal = 0; - - try { - if ((int) sig > 0 && handlers[sig] != null) { - SignalHandler handler = (SignalHandler) handlers[sig]; - handler (sig); - } - } catch (Exception e) { - log.Info ("Exception in signal handler: " + e); + private static void InternalHandler (Signum sig) { + try { + if ((int) sig > 0 && handlers[sig] != null) { + SignalHandler handler = (SignalHandler) handlers[sig]; + handler (sig); } + } catch (Exception e) { + log.Error ("Exception in signal handler: " + e.Message, e); } } - private static void InternalHandler (Signum sig) { - if (dummy) - return; - - lastSignal = sig; - } - public static void RegisterHandler (Signum signal, SignalHandler handler) { handlers[signal] = handler; - - SigActionData data = new SigActionData (new SignalHandler (InternalHandler)); - sigaction ((int) signal, ref data, IntPtr.Zero); + zmd_signal_handle (signal); } public static void Block (Signum sig) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/src/util.c new/zmd-7.1.1/src/util.c --- old/zmd-7.1.1/src/util.c 2006-02-28 18:41:48.000000000 +0100 +++ new/zmd-7.1.1/src/util.c 2006-04-01 19:14:55.000000000 +0200 @@ -2,10 +2,20 @@ #include <sys/types.h> #include <sys/socket.h> #include <sys/utsname.h> +#include <signal.h> + +#define PIPE_DATA "woo" +#define PIPE_DATA_LEN 4 int zmd_get_socket_uid (int fd); char *zmd_get_arch (void); +typedef void (* SignalHandler) (int signum); + +static int signal_read_pipe; +static int signal_write_pipe; +static int last_signal; + int zmd_get_socket_uid (int fd) { @@ -33,3 +43,52 @@ return NULL; } } + +static void +signal_reader (SignalHandler handler) +{ + for (;;) { + fd_set fds; + + FD_ZERO (&fds); + FD_SET (signal_read_pipe, &fds); + + if (select (signal_read_pipe+1, &fds, NULL, NULL, NULL) > 0) { + int buf[PIPE_DATA_LEN]; + read (signal_read_pipe, buf, PIPE_DATA_LEN); + + handler (last_signal); + } + } +} + +static void +signal_handler (int signum) +{ + last_signal = signum; + write (signal_write_pipe, PIPE_DATA, PIPE_DATA_LEN); +} + +void +zmd_signal_handler_start (SignalHandler *handler) +{ + pthread_t thread; + int pipes[2]; + + pipe (pipes); + signal_read_pipe = pipes[0]; + signal_write_pipe = pipes[1]; + pthread_create (&thread, NULL, signal_reader, handler); +} + +void +zmd_signal_handle (int sig) +{ + signal (sig, signal_handler); +} + +void +zmd_signal_unhandle (int sig) +{ + signal (sig, SIG_DFL); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/zmd-7.1.1/zmd.conf new/zmd-7.1.1/zmd.conf --- old/zmd-7.1.1/zmd.conf 2006-03-28 03:10:58.000000000 +0200 +++ new/zmd-7.1.1/zmd.conf 2006-03-22 17:08:44.000000000 +0100 @@ -1,9 +1,5 @@ [Server] bind-ip=127.0.0.1 -<<<<<<< .mine -remote-enabled=False -======= refresh-interval=86400 remote-enabled=false ->>>>>>> .r26285 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit zen-updater
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package zen-updater checked in at Wed Apr 5 01:05:38 CEST 2006. -------- --- zen-updater/zen-updater.changes 2006-04-04 14:46:37.000000000 +0200 +++ zen-updater/zen-updater.changes 2006-04-04 20:38:22.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Apr 4 20:31:17 CEST 2006 - maw(a)suse.de + +- New source drop (r26628) which: +- Presents the configure and update windows to the user if they are + already being displayed. + +- Remove the autostart patch; it's in svn now. + +------------------------------------------------------------------- Old: ---- fix-autostart-configuration.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zen-updater.spec ++++++ --- /var/tmp/diff_new_pack.NyZD3U/_old 2006-04-05 01:03:53.000000000 +0200 +++ /var/tmp/diff_new_pack.NyZD3U/_new 2006-04-05 01:03:53.000000000 +0200 @@ -14,13 +14,12 @@ BuildRequires: glib-sharp2 gtk-sharp2 gtk2-devel log4net mono-basic mono-data-sqlite mono-devel perl-XML-Parser update-desktop-files zmd-devel URL: http://novell.com/ Version: 7.1.0 -Release: 28 +Release: 29 License: LGPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %name-%version.tar.bz2 Source1: %name-po.tar.bz2 Patch0: zen-updater-transparent-trayicon.patch -Patch1: fix-autostart-configuration.diff Summary: Novell ZENworks Linux Management daemon Group: System/Management Autoreqprov: on @@ -41,7 +40,6 @@ %setup -q -a1 sed -i 's/^ALL_LINGUAS="/&ar bg bn br bs ca cs cy da de el_GR es fi fr gl he hi hr hu id it ja ka km ko lo lt nb nl pa pl pt_BR pt ro ru sk sl_SI sr sv ta tr uk zh_CN zh zh_TW /' configure.in configure %patch0 -p0 -%patch1 %build CFLAGS="$RPM_OPT_FLAGS" CPPFLAGS="-w" \ @@ -76,6 +74,11 @@ %{_mandir}/*/* %changelog -n zen-updater +* Tue Apr 04 2006 - maw(a)suse.de +- New source drop (r26628) which: +- Presents the configure and update windows to the user if they are + already being displayed. +- Remove the autostart patch; it's in svn now. * Tue Apr 04 2006 - sbrabec(a)suse.cz - Updated Czech translation. * Fri Mar 31 2006 - stbinner(a)suse.de ++++++ zen-updater-7.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/ChangeLog new/zen-updater-7.1.0/ChangeLog --- old/zen-updater-7.1.0/ChangeLog 2006-03-29 02:03:55.000000000 +0200 +++ new/zen-updater-7.1.0/ChangeLog 2006-04-03 22:07:31.000000000 +0200 @@ -1,3 +1,22 @@ +2006-03-31 Chris Rivera <cmr(a)ximian.com> + + * src/UpdaterWindow.cs: + * src/ConfigureWindow.cs: Present the windows to the user if they are + already displayed and hidden. + +2006-03-31 Chris Rivera <cmr(a)ximian.com> + + * src/ConfigureWindow.cs: Look for the correct global autostart desktop + file. + +2006-03-28 Chris Rivera <cmr(a)ximian.com> + + * src/InstallerWindow.cs: + * src/RemoverWindow.cs: + * src/UpdaterWindow.cs: + + Show prepare/transaction progress in the title bar. + 2006-03-28 Chris Rivera <cmr(a)ximian.com> * src/ConfigureWindow.cs: Implement proper startup handling based on Binary files old/zen-updater-7.1.0/po/cs_CZ.gmo and new/zen-updater-7.1.0/po/cs_CZ.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/cs_CZ.po new/zen-updater-7.1.0/po/cs_CZ.po --- old/zen-updater-7.1.0/po/cs_CZ.po 2006-03-29 02:30:09.000000000 +0200 +++ new/zen-updater-7.1.0/po/cs_CZ.po 2006-03-30 22:36:44.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: zen-updater\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-30 15:36-0500\n" "PO-Revision-Date: 2006-02-01 17:03+0100\n" "Last-Translator: Jakub Friedl <jfriedl(a)suse.cz>\n" "Language-Team: <cs(a)li.org>\n" @@ -147,7 +147,7 @@ msgid "Remove the following software" msgstr "Odstranit tento software" -#: src/InstallerWindow.cs:67 +#: src/InstallerWindow.cs:67 src/InstallerWindow.cs:541 msgid "Software Installer" msgstr "" @@ -255,20 +255,31 @@ msgid "The installation was successful." msgstr "Transakce byla úspěšná." -#: src/InstallerWindow.cs:542 src/RemoverWindow.cs:389 -#: src/UpdaterWindow.cs:462 +#: src/InstallerWindow.cs:543 src/RemoverWindow.cs:390 +#: src/UpdaterWindow.cs:463 msgid "Transaction failed: " msgstr "Transakce selhala: " -#: src/InstallerWindow.cs:604 src/UpdaterWindow.cs:533 +#: src/InstallerWindow.cs:554 src/RemoverWindow.cs:402 +#: src/UpdaterWindow.cs:475 +#, fuzzy +msgid "Preparing Software" +msgstr "Příprava svazků..." + +#: src/InstallerWindow.cs:555 +#, fuzzy +msgid "Installing Software" +msgstr "Nainstalovat tento software" + +#: src/InstallerWindow.cs:609 src/UpdaterWindow.cs:538 msgid "Resolving dependencies..." msgstr "" -#: src/InstallerWindow.cs:611 src/UpdaterWindow.cs:540 +#: src/InstallerWindow.cs:616 src/UpdaterWindow.cs:545 msgid "Total download size" msgstr "" -#: src/InstallerWindow.cs:615 src/UpdaterWindow.cs:544 +#: src/InstallerWindow.cs:620 src/UpdaterWindow.cs:549 msgid "Dependencies cannot be met." msgstr "" @@ -289,7 +300,7 @@ msgid "Please insert media with the label" msgstr "" -#: src/RemoverWindow.cs:59 +#: src/RemoverWindow.cs:59 src/RemoverWindow.cs:388 msgid "Software Remover" msgstr "" @@ -328,6 +339,11 @@ msgid "The removal was successful." msgstr "Transakce byla úspěšná." +#: src/RemoverWindow.cs:403 +#, fuzzy +msgid "Removing Software" +msgstr "Aktualizace..." + #: src/ResolvableContent.cs:387 msgid "Resolvables" msgstr "" @@ -433,7 +449,7 @@ msgid "ZMD does not appear to be running." msgstr "ZMD zřejmě neběží." -#: src/UpdaterWindow.cs:66 +#: src/UpdaterWindow.cs:66 src/UpdaterWindow.cs:461 msgid "Software Updater" msgstr "" @@ -476,6 +492,11 @@ msgid "The update was successful." msgstr "Transakce byla úspěšná." +#: src/UpdaterWindow.cs:476 +#, fuzzy +msgid "Updating Software" +msgstr "Aktualizovat software" + #: src/Util.cs:82 msgid "Information" msgstr "" Binary files old/zen-updater-7.1.0/po/de_DE.gmo and new/zen-updater-7.1.0/po/de_DE.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/de_DE.po new/zen-updater-7.1.0/po/de_DE.po --- old/zen-updater-7.1.0/po/de_DE.po 2006-03-29 02:30:08.000000000 +0200 +++ new/zen-updater-7.1.0/po/de_DE.po 2006-03-30 22:36:43.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 7.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-30 15:36-0500\n" "PO-Revision-Date: 2006-03-03 17:29-0500\n" "Last-Translator: Maher <smaher(a)novell.com>\n" "Language-Team: team <language(a)novell.com>\n" @@ -141,7 +141,7 @@ msgid "Remove the following software" msgstr "Folgende Software entfernen" -#: src/InstallerWindow.cs:67 +#: src/InstallerWindow.cs:67 src/InstallerWindow.cs:541 msgid "Software Installer" msgstr "Software Installer" @@ -247,20 +247,31 @@ msgid "The installation was successful." msgstr "Die Transaktion war erfolgreich." -#: src/InstallerWindow.cs:542 src/RemoverWindow.cs:389 -#: src/UpdaterWindow.cs:462 +#: src/InstallerWindow.cs:543 src/RemoverWindow.cs:390 +#: src/UpdaterWindow.cs:463 msgid "Transaction failed: " msgstr "Fehler bei Transaktion: " -#: src/InstallerWindow.cs:604 src/UpdaterWindow.cs:533 +#: src/InstallerWindow.cs:554 src/RemoverWindow.cs:402 +#: src/UpdaterWindow.cs:475 +#, fuzzy +msgid "Preparing Software" +msgstr "Vorbereitung" + +#: src/InstallerWindow.cs:555 +#, fuzzy +msgid "Installing Software" +msgstr "Installing software..." + +#: src/InstallerWindow.cs:609 src/UpdaterWindow.cs:538 msgid "Resolving dependencies..." msgstr "Resolving dependencies..." -#: src/InstallerWindow.cs:611 src/UpdaterWindow.cs:540 +#: src/InstallerWindow.cs:616 src/UpdaterWindow.cs:545 msgid "Total download size" msgstr "Total download size" -#: src/InstallerWindow.cs:615 src/UpdaterWindow.cs:544 +#: src/InstallerWindow.cs:620 src/UpdaterWindow.cs:549 msgid "Dependencies cannot be met." msgstr "Dependencies cannot be met." @@ -281,7 +292,7 @@ msgid "Please insert media with the label" msgstr "" -#: src/RemoverWindow.cs:59 +#: src/RemoverWindow.cs:59 src/RemoverWindow.cs:388 msgid "Software Remover" msgstr "Software-Entfernungsfunktion" @@ -322,6 +333,11 @@ msgid "The removal was successful." msgstr "Die Transaktion war erfolgreich." +#: src/RemoverWindow.cs:403 +#, fuzzy +msgid "Removing Software" +msgstr "Removing software..." + #: src/ResolvableContent.cs:387 msgid "Resolvables" msgstr "" @@ -424,7 +440,7 @@ msgid "ZMD does not appear to be running." msgstr "ZMD wird anscheinend nicht ausgeführt." -#: src/UpdaterWindow.cs:66 +#: src/UpdaterWindow.cs:66 src/UpdaterWindow.cs:461 msgid "Software Updater" msgstr "Software-Aktualisierungsfunktion" @@ -467,6 +483,11 @@ msgid "The update was successful." msgstr "Die Transaktion war erfolgreich." +#: src/UpdaterWindow.cs:476 +#, fuzzy +msgid "Updating Software" +msgstr "Updating software..." + #: src/Util.cs:82 msgid "Information" msgstr "Informationen" Binary files old/zen-updater-7.1.0/po/en_US.gmo and new/zen-updater-7.1.0/po/en_US.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/en_US.po new/zen-updater-7.1.0/po/en_US.po --- old/zen-updater-7.1.0/po/en_US.po 2006-03-29 02:30:08.000000000 +0200 +++ new/zen-updater-7.1.0/po/en_US.po 2006-03-30 22:36:44.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 7.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-30 15:36-0500\n" "PO-Revision-Date: 2006-03-03 17:29-0500\n" "Last-Translator: Maher <smaher(a)novell.com>\n" "Language-Team: team <language(a)novell.com>\n" @@ -141,7 +141,7 @@ msgid "Remove the following software" msgstr "Remove the following software" -#: src/InstallerWindow.cs:67 +#: src/InstallerWindow.cs:67 src/InstallerWindow.cs:541 msgid "Software Installer" msgstr "Software Installer" @@ -247,20 +247,31 @@ msgid "The installation was successful." msgstr "The transaction was successful." -#: src/InstallerWindow.cs:542 src/RemoverWindow.cs:389 -#: src/UpdaterWindow.cs:462 +#: src/InstallerWindow.cs:543 src/RemoverWindow.cs:390 +#: src/UpdaterWindow.cs:463 msgid "Transaction failed: " msgstr "Transaction failed: " -#: src/InstallerWindow.cs:604 src/UpdaterWindow.cs:533 +#: src/InstallerWindow.cs:554 src/RemoverWindow.cs:402 +#: src/UpdaterWindow.cs:475 +#, fuzzy +msgid "Preparing Software" +msgstr "Preparing" + +#: src/InstallerWindow.cs:555 +#, fuzzy +msgid "Installing Software" +msgstr "Installing software..." + +#: src/InstallerWindow.cs:609 src/UpdaterWindow.cs:538 msgid "Resolving dependencies..." msgstr "Resolving dependencies..." -#: src/InstallerWindow.cs:611 src/UpdaterWindow.cs:540 +#: src/InstallerWindow.cs:616 src/UpdaterWindow.cs:545 msgid "Total download size" msgstr "Total download size" -#: src/InstallerWindow.cs:615 src/UpdaterWindow.cs:544 +#: src/InstallerWindow.cs:620 src/UpdaterWindow.cs:549 msgid "Dependencies cannot be met." msgstr "Dependencies cannot be met." @@ -281,7 +292,7 @@ msgid "Please insert media with the label" msgstr "" -#: src/RemoverWindow.cs:59 +#: src/RemoverWindow.cs:59 src/RemoverWindow.cs:388 msgid "Software Remover" msgstr "Software Remover" @@ -320,6 +331,11 @@ msgid "The removal was successful." msgstr "The transaction was successful." +#: src/RemoverWindow.cs:403 +#, fuzzy +msgid "Removing Software" +msgstr "Removing software..." + #: src/ResolvableContent.cs:387 msgid "Resolvables" msgstr "" @@ -422,7 +438,7 @@ msgid "ZMD does not appear to be running." msgstr "ZMD does not appear to be running." -#: src/UpdaterWindow.cs:66 +#: src/UpdaterWindow.cs:66 src/UpdaterWindow.cs:461 msgid "Software Updater" msgstr "Software Updater" @@ -465,6 +481,11 @@ msgid "The update was successful." msgstr "The transaction was successful." +#: src/UpdaterWindow.cs:476 +#, fuzzy +msgid "Updating Software" +msgstr "Updating software..." + #: src/Util.cs:82 msgid "Information" msgstr "Information" Binary files old/zen-updater-7.1.0/po/es_ES.gmo and new/zen-updater-7.1.0/po/es_ES.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/es_ES.po new/zen-updater-7.1.0/po/es_ES.po --- old/zen-updater-7.1.0/po/es_ES.po 2006-03-29 02:30:08.000000000 +0200 +++ new/zen-updater-7.1.0/po/es_ES.po 2006-03-30 22:36:44.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 7.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-30 15:36-0500\n" "PO-Revision-Date: 2006-03-03 17:29-0500\n" "Last-Translator: Maher <smaher(a)novell.com>\n" "Language-Team: team <language(a)novell.com>\n" @@ -141,7 +141,7 @@ msgid "Remove the following software" msgstr "Desinstalar el software siguiente" -#: src/InstallerWindow.cs:67 +#: src/InstallerWindow.cs:67 src/InstallerWindow.cs:541 msgid "Software Installer" msgstr "Software Installer" @@ -247,20 +247,31 @@ msgid "The installation was successful." msgstr "La transacción se realizó correctamente." -#: src/InstallerWindow.cs:542 src/RemoverWindow.cs:389 -#: src/UpdaterWindow.cs:462 +#: src/InstallerWindow.cs:543 src/RemoverWindow.cs:390 +#: src/UpdaterWindow.cs:463 msgid "Transaction failed: " msgstr "Error en la transacción: " -#: src/InstallerWindow.cs:604 src/UpdaterWindow.cs:533 +#: src/InstallerWindow.cs:554 src/RemoverWindow.cs:402 +#: src/UpdaterWindow.cs:475 +#, fuzzy +msgid "Preparing Software" +msgstr "En preparación" + +#: src/InstallerWindow.cs:555 +#, fuzzy +msgid "Installing Software" +msgstr "Installing software..." + +#: src/InstallerWindow.cs:609 src/UpdaterWindow.cs:538 msgid "Resolving dependencies..." msgstr "Resolving dependencies..." -#: src/InstallerWindow.cs:611 src/UpdaterWindow.cs:540 +#: src/InstallerWindow.cs:616 src/UpdaterWindow.cs:545 msgid "Total download size" msgstr "Total download size" -#: src/InstallerWindow.cs:615 src/UpdaterWindow.cs:544 +#: src/InstallerWindow.cs:620 src/UpdaterWindow.cs:549 msgid "Dependencies cannot be met." msgstr "Dependencies cannot be met." @@ -281,7 +292,7 @@ msgid "Please insert media with the label" msgstr "" -#: src/RemoverWindow.cs:59 +#: src/RemoverWindow.cs:59 src/RemoverWindow.cs:388 msgid "Software Remover" msgstr "Desinstalador de software" @@ -322,6 +333,11 @@ msgid "The removal was successful." msgstr "La transacción se realizó correctamente." +#: src/RemoverWindow.cs:403 +#, fuzzy +msgid "Removing Software" +msgstr "Removing software..." + #: src/ResolvableContent.cs:387 msgid "Resolvables" msgstr "" @@ -424,7 +440,7 @@ msgid "ZMD does not appear to be running." msgstr "Parece que ZMD no se está ejecutando." -#: src/UpdaterWindow.cs:66 +#: src/UpdaterWindow.cs:66 src/UpdaterWindow.cs:461 msgid "Software Updater" msgstr "Actualizador de software" @@ -467,6 +483,11 @@ msgid "The update was successful." msgstr "La transacción se realizó correctamente." +#: src/UpdaterWindow.cs:476 +#, fuzzy +msgid "Updating Software" +msgstr "Updating software..." + #: src/Util.cs:82 msgid "Information" msgstr "Información" Binary files old/zen-updater-7.1.0/po/fr_FR.gmo and new/zen-updater-7.1.0/po/fr_FR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/fr_FR.po new/zen-updater-7.1.0/po/fr_FR.po --- old/zen-updater-7.1.0/po/fr_FR.po 2006-03-29 02:30:08.000000000 +0200 +++ new/zen-updater-7.1.0/po/fr_FR.po 2006-03-30 22:36:44.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 7.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-30 15:36-0500\n" "PO-Revision-Date: 2006-03-03 17:29-0500\n" "Last-Translator: Maher <smaher(a)novell.com>\n" "Language-Team: team <language(a)novell.com>\n" @@ -141,7 +141,7 @@ msgid "Remove the following software" msgstr "Supprimer le logiciel suivant" -#: src/InstallerWindow.cs:67 +#: src/InstallerWindow.cs:67 src/InstallerWindow.cs:541 msgid "Software Installer" msgstr "Software Installer" @@ -247,20 +247,31 @@ msgid "The installation was successful." msgstr "La transaction a réussi." -#: src/InstallerWindow.cs:542 src/RemoverWindow.cs:389 -#: src/UpdaterWindow.cs:462 +#: src/InstallerWindow.cs:543 src/RemoverWindow.cs:390 +#: src/UpdaterWindow.cs:463 msgid "Transaction failed: " msgstr "Échec de la transaction : " -#: src/InstallerWindow.cs:604 src/UpdaterWindow.cs:533 +#: src/InstallerWindow.cs:554 src/RemoverWindow.cs:402 +#: src/UpdaterWindow.cs:475 +#, fuzzy +msgid "Preparing Software" +msgstr "Préparation" + +#: src/InstallerWindow.cs:555 +#, fuzzy +msgid "Installing Software" +msgstr "Installing software..." + +#: src/InstallerWindow.cs:609 src/UpdaterWindow.cs:538 msgid "Resolving dependencies..." msgstr "Resolving dependencies..." -#: src/InstallerWindow.cs:611 src/UpdaterWindow.cs:540 +#: src/InstallerWindow.cs:616 src/UpdaterWindow.cs:545 msgid "Total download size" msgstr "Total download size" -#: src/InstallerWindow.cs:615 src/UpdaterWindow.cs:544 +#: src/InstallerWindow.cs:620 src/UpdaterWindow.cs:549 msgid "Dependencies cannot be met." msgstr "Dependencies cannot be met." @@ -281,7 +292,7 @@ msgid "Please insert media with the label" msgstr "" -#: src/RemoverWindow.cs:59 +#: src/RemoverWindow.cs:59 src/RemoverWindow.cs:388 msgid "Software Remover" msgstr "Programme de suppression de logiciel" @@ -320,6 +331,11 @@ msgid "The removal was successful." msgstr "La transaction a réussi." +#: src/RemoverWindow.cs:403 +#, fuzzy +msgid "Removing Software" +msgstr "Removing software..." + #: src/ResolvableContent.cs:387 msgid "Resolvables" msgstr "" @@ -422,7 +438,7 @@ msgid "ZMD does not appear to be running." msgstr "ZMD ne semble pas fonctionner." -#: src/UpdaterWindow.cs:66 +#: src/UpdaterWindow.cs:66 src/UpdaterWindow.cs:461 msgid "Software Updater" msgstr "Programme de mise à jour de logiciel" @@ -465,6 +481,11 @@ msgid "The update was successful." msgstr "La transaction a réussi." +#: src/UpdaterWindow.cs:476 +#, fuzzy +msgid "Updating Software" +msgstr "Updating software..." + #: src/Util.cs:82 msgid "Information" msgstr "Informations" Binary files old/zen-updater-7.1.0/po/pt_BR.gmo and new/zen-updater-7.1.0/po/pt_BR.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/pt_BR.po new/zen-updater-7.1.0/po/pt_BR.po --- old/zen-updater-7.1.0/po/pt_BR.po 2006-03-29 02:30:09.000000000 +0200 +++ new/zen-updater-7.1.0/po/pt_BR.po 2006-03-30 22:36:44.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version:7.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-03-30 15:36-0500\n" "PO-Revision-Date: 2006-03-03 17:29-0500\n" "Last-Translator: Maher <smaher(a)novell.com>\n" "Language-Team: team <language(a)novell.com>\n" @@ -141,7 +141,7 @@ msgid "Remove the following software" msgstr "Remover o software a seguir" -#: src/InstallerWindow.cs:67 +#: src/InstallerWindow.cs:67 src/InstallerWindow.cs:541 msgid "Software Installer" msgstr "Software Installer" @@ -247,20 +247,31 @@ msgid "The installation was successful." msgstr "A transação foi bem-sucedida." -#: src/InstallerWindow.cs:542 src/RemoverWindow.cs:389 -#: src/UpdaterWindow.cs:462 +#: src/InstallerWindow.cs:543 src/RemoverWindow.cs:390 +#: src/UpdaterWindow.cs:463 msgid "Transaction failed: " msgstr "Falha na transação: " -#: src/InstallerWindow.cs:604 src/UpdaterWindow.cs:533 +#: src/InstallerWindow.cs:554 src/RemoverWindow.cs:402 +#: src/UpdaterWindow.cs:475 +#, fuzzy +msgid "Preparing Software" +msgstr "Preparando" + +#: src/InstallerWindow.cs:555 +#, fuzzy +msgid "Installing Software" +msgstr "Installing software..." + +#: src/InstallerWindow.cs:609 src/UpdaterWindow.cs:538 msgid "Resolving dependencies..." msgstr "Resolving dependencies..." -#: src/InstallerWindow.cs:611 src/UpdaterWindow.cs:540 +#: src/InstallerWindow.cs:616 src/UpdaterWindow.cs:545 msgid "Total download size" msgstr "Total download size" -#: src/InstallerWindow.cs:615 src/UpdaterWindow.cs:544 +#: src/InstallerWindow.cs:620 src/UpdaterWindow.cs:549 msgid "Dependencies cannot be met." msgstr "Dependencies cannot be met." @@ -281,7 +292,7 @@ msgid "Please insert media with the label" msgstr "" -#: src/RemoverWindow.cs:59 +#: src/RemoverWindow.cs:59 src/RemoverWindow.cs:388 msgid "Software Remover" msgstr "Removedor de Software" @@ -321,6 +332,11 @@ msgid "The removal was successful." msgstr "A transação foi bem-sucedida." +#: src/RemoverWindow.cs:403 +#, fuzzy +msgid "Removing Software" +msgstr "Removing software..." + #: src/ResolvableContent.cs:387 msgid "Resolvables" msgstr "" @@ -423,7 +439,7 @@ msgid "ZMD does not appear to be running." msgstr "O ZMD parece não estar sendo executado." -#: src/UpdaterWindow.cs:66 +#: src/UpdaterWindow.cs:66 src/UpdaterWindow.cs:461 msgid "Software Updater" msgstr "Atualizador de Software" @@ -466,6 +482,11 @@ msgid "The update was successful." msgstr "A transação foi bem-sucedida." +#: src/UpdaterWindow.cs:476 +#, fuzzy +msgid "Updating Software" +msgstr "Updating software..." + #: src/Util.cs:82 msgid "Information" msgstr "Informações" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/po/zen-updater.pot new/zen-updater-7.1.0/po/zen-updater.pot --- old/zen-updater-7.1.0/po/zen-updater.pot 2006-03-29 02:30:08.000000000 +0200 +++ new/zen-updater-7.1.0/po/zen-updater.pot 2006-04-04 18:39:19.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-03-28 19:30-0500\n" +"POT-Creation-Date: 2006-04-04 12:39-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -103,7 +103,7 @@ msgid "Catalogs" msgstr "" -#: src/ConfigureWindow.cs:614 +#: src/ConfigureWindow.cs:613 msgid "Preferences" msgstr "" @@ -135,7 +135,7 @@ msgid "Remove the following software" msgstr "" -#: src/InstallerWindow.cs:67 +#: src/InstallerWindow.cs:67 src/InstallerWindow.cs:541 msgid "Software Installer" msgstr "" @@ -203,15 +203,15 @@ #: src/InstallerWindow.cs:389 src/InstallerWindow.cs:461 #: src/InstallerWindow.cs:472 src/RemoverWindow.cs:276 -#: src/RemoverWindow.cs:314 src/RemoverWindow.cs:325 src/UpdaterWindow.cs:328 -#: src/UpdaterWindow.cs:385 src/UpdaterWindow.cs:396 +#: src/RemoverWindow.cs:314 src/RemoverWindow.cs:325 src/UpdaterWindow.cs:330 +#: src/UpdaterWindow.cs:387 src/UpdaterWindow.cs:398 msgid "available" msgstr "" #: src/InstallerWindow.cs:389 src/InstallerWindow.cs:462 #: src/InstallerWindow.cs:473 src/RemoverWindow.cs:276 -#: src/RemoverWindow.cs:315 src/RemoverWindow.cs:326 src/UpdaterWindow.cs:328 -#: src/UpdaterWindow.cs:386 src/UpdaterWindow.cs:397 +#: src/RemoverWindow.cs:315 src/RemoverWindow.cs:326 src/UpdaterWindow.cs:330 +#: src/UpdaterWindow.cs:388 src/UpdaterWindow.cs:399 msgid "marked" msgstr "" @@ -222,7 +222,7 @@ msgstr "" #: src/InstallerWindow.cs:446 src/RemoverWindow.cs:303 -#: src/UpdaterWindow.cs:372 +#: src/UpdaterWindow.cs:374 msgid "Resolving dependencies..." msgstr "" @@ -239,20 +239,29 @@ msgid "The installation was successful." msgstr "" -#: src/InstallerWindow.cs:542 src/RemoverWindow.cs:389 -#: src/UpdaterWindow.cs:462 +#: src/InstallerWindow.cs:543 src/RemoverWindow.cs:390 +#: src/UpdaterWindow.cs:465 msgid "Transaction failed: " msgstr "" -#: src/InstallerWindow.cs:604 src/UpdaterWindow.cs:533 +#: src/InstallerWindow.cs:554 src/RemoverWindow.cs:402 +#: src/UpdaterWindow.cs:477 +msgid "Preparing Software" +msgstr "" + +#: src/InstallerWindow.cs:555 +msgid "Installing Software" +msgstr "" + +#: src/InstallerWindow.cs:609 src/UpdaterWindow.cs:540 msgid "Resolving dependencies..." msgstr "" -#: src/InstallerWindow.cs:611 src/UpdaterWindow.cs:540 +#: src/InstallerWindow.cs:616 src/UpdaterWindow.cs:547 msgid "Total download size" msgstr "" -#: src/InstallerWindow.cs:615 src/UpdaterWindow.cs:544 +#: src/InstallerWindow.cs:620 src/UpdaterWindow.cs:551 msgid "Dependencies cannot be met." msgstr "" @@ -272,7 +281,7 @@ msgid "Please insert media with the label" msgstr "" -#: src/RemoverWindow.cs:59 +#: src/RemoverWindow.cs:59 src/RemoverWindow.cs:388 msgid "Software Remover" msgstr "" @@ -310,6 +319,10 @@ msgid "The removal was successful." msgstr "" +#: src/RemoverWindow.cs:403 +msgid "Removing Software" +msgstr "" + #: src/ResolvableContent.cs:387 msgid "Resolvables" msgstr "" @@ -404,7 +417,7 @@ msgid "ZMD does not appear to be running." msgstr "" -#: src/UpdaterWindow.cs:66 +#: src/UpdaterWindow.cs:66 src/UpdaterWindow.cs:463 msgid "Software Updater" msgstr "" @@ -420,32 +433,36 @@ msgid "_Update" msgstr "" -#: src/UpdaterWindow.cs:263 +#: src/UpdaterWindow.cs:265 msgid "Getting update list..." msgstr "" -#: src/UpdaterWindow.cs:293 +#: src/UpdaterWindow.cs:295 msgid "There are no updates available." msgstr "" -#: src/UpdaterWindow.cs:329 src/UpdaterWindow.cs:384 src/UpdaterWindow.cs:395 +#: src/UpdaterWindow.cs:331 src/UpdaterWindow.cs:386 src/UpdaterWindow.cs:397 #, csharp-format msgid "Software {0} for update:" msgstr "" -#: src/UpdaterWindow.cs:403 src/UpdaterWindow.cs:411 +#: src/UpdaterWindow.cs:405 src/UpdaterWindow.cs:413 #, csharp-format msgid "Updating software..." msgstr "" -#: src/UpdaterWindow.cs:438 +#: src/UpdaterWindow.cs:440 msgid "Preparing Updates..." msgstr "" -#: src/UpdaterWindow.cs:444 +#: src/UpdaterWindow.cs:446 msgid "The update was successful." msgstr "" +#: src/UpdaterWindow.cs:478 +msgid "Updating Software" +msgstr "" + #: src/Util.cs:82 msgid "Information" msgstr "" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/BundleContent.cs new/zen-updater-7.1.0/src/BundleContent.cs --- old/zen-updater-7.1.0/src/BundleContent.cs 2006-03-21 17:51:30.000000000 +0100 +++ new/zen-updater-7.1.0/src/BundleContent.cs 2006-03-29 05:34:46.000000000 +0200 @@ -319,7 +319,7 @@ while (!progress.IsStopped) { if (handler != null) { string msg = Util.GetProgressString (progress, type, action, preparing); - handler (msg, progress.Percent / 100.0); + handler (msg, progress.Percent / 100.0, preparing); } System.Threading.Thread.Sleep (1000); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/ConfigureWindow.cs new/zen-updater-7.1.0/src/ConfigureWindow.cs --- old/zen-updater-7.1.0/src/ConfigureWindow.cs 2006-03-29 02:01:14.000000000 +0200 +++ new/zen-updater-7.1.0/src/ConfigureWindow.cs 2006-04-03 22:05:43.000000000 +0200 @@ -608,8 +608,7 @@ cp = new CatalogPage (this); notebook.AppendPage (cp, new Label (Catalog.GetString ("Catalogs"))); - if (File.Exists ("/opt/gnome/share/autostart/zen-updater-auto.desktop") || - File.Exists ("/opt/kde3/share/autostart/zen-updater-auto.desktop")) { + if (File.Exists ("/etc/xdg/autostart/zen-updater-auto.desktop")) { pp = new PreferencePage (this); notebook.AppendPage (pp, new Label (Catalog.GetString ("Preferences"))); } @@ -630,6 +629,7 @@ public void DisplayAll () { ShowAll (); sp.DisplayAll (); + Present (); } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/IContent.cs new/zen-updater-7.1.0/src/IContent.cs --- old/zen-updater-7.1.0/src/IContent.cs 2006-03-15 20:37:48.000000000 +0100 +++ new/zen-updater-7.1.0/src/IContent.cs 2006-03-29 05:31:05.000000000 +0200 @@ -25,7 +25,7 @@ namespace Novell.Zenworks.Gui { - public delegate void UpdateHandler (string text, double percent); + public delegate void UpdateHandler (string text, double percent, bool preparing); public delegate void FinishedHandler (bool successful, string reason); public delegate void SearchHandler (string text); public delegate void MediaChangeHandler (string label, MediaResponseHandler handler); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/InstallerWindow.cs new/zen-updater-7.1.0/src/InstallerWindow.cs --- old/zen-updater-7.1.0/src/InstallerWindow.cs 2006-03-27 01:09:32.000000000 +0200 +++ new/zen-updater-7.1.0/src/InstallerWindow.cs 2006-03-29 05:37:59.000000000 +0200 @@ -538,6 +538,7 @@ private void EndInstall (bool successful, string reason) { Gtk.Application.Invoke (delegate { + Title = Catalog.GetString ("Software Installer"); if (!successful) { Util.Error (this, Catalog.GetString ("Transaction failed: ") + reason); } else { @@ -547,8 +548,12 @@ }); } - private void UpdateProgressBar (string text, double percent) { + private void UpdateProgressBar (string text, double percent, bool preparing) { Gtk.Application.Invoke (delegate { + Title = String.Format ("{0} - {1}%", + preparing ? Catalog.GetString ("Preparing Software") : + Catalog.GetString ("Installing Software"), + Math.Round (percent * 100.0)); progressBar.Text = text; progressBar.Fraction = percent; }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/PackageContent.cs new/zen-updater-7.1.0/src/PackageContent.cs --- old/zen-updater-7.1.0/src/PackageContent.cs 2006-03-24 22:28:42.000000000 +0100 +++ new/zen-updater-7.1.0/src/PackageContent.cs 2006-03-29 05:33:03.000000000 +0200 @@ -370,7 +370,7 @@ while (!progress.IsStopped) { if (handler != null) { string msg = Util.GetProgressString (progress, type, action, true); - handler (msg, progress.Percent / 100.0); + handler (msg, progress.Percent / 100.0, true); } System.Threading.Thread.Sleep (1000); @@ -390,7 +390,7 @@ if (handler != null) { string msg = Util.GetProgressString (progress, type, action, false); - handler (msg, progress.Percent / 100.0); + handler (msg, progress.Percent / 100.0, false); } System.Threading.Thread.Sleep (2000); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/RemoverWindow.cs new/zen-updater-7.1.0/src/RemoverWindow.cs --- old/zen-updater-7.1.0/src/RemoverWindow.cs 2006-03-24 22:59:11.000000000 +0100 +++ new/zen-updater-7.1.0/src/RemoverWindow.cs 2006-03-29 05:37:25.000000000 +0200 @@ -385,6 +385,7 @@ private void EndRemoval (bool successful, string reason) { Gtk.Application.Invoke (delegate { + Title = Catalog.GetString ("Software Remover"); if (!successful) { Util.Error (null, Catalog.GetString ("Transaction failed: ") + reason); } else { @@ -395,8 +396,12 @@ }); } - private void UpdateProgressBar (string text, double percent) { + private void UpdateProgressBar (string text, double percent, bool preparing) { Gtk.Application.Invoke (delegate { + Title = String.Format ("{0} - {1}%", + preparing ? Catalog.GetString ("Preparing Software") : + Catalog.GetString ("Removing Software"), + Math.Round (percent * 100.0, 0)); progressBar.Text = text; progressBar.Fraction = percent; }); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/ResolvableContent.cs new/zen-updater-7.1.0/src/ResolvableContent.cs --- old/zen-updater-7.1.0/src/ResolvableContent.cs 2006-03-27 04:20:03.000000000 +0200 +++ new/zen-updater-7.1.0/src/ResolvableContent.cs 2006-03-29 05:34:12.000000000 +0200 @@ -428,7 +428,7 @@ while (!progress.IsStopped) { if (handler != null) { string msg = Util.GetProgressString (progress, type, action, true); - handler (msg, progress.Percent / 100.0); + handler (msg, progress.Percent / 100.0, true); } System.Threading.Thread.Sleep (1000); @@ -448,7 +448,7 @@ if (handler != null) { string msg = Util.GetProgressString (progress, type, action, false); - handler (msg, progress.Percent / 100.0); + handler (msg, progress.Percent / 100.0, false); } System.Threading.Thread.Sleep (2000); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zen-updater-7.1.0/src/UpdaterWindow.cs new/zen-updater-7.1.0/src/UpdaterWindow.cs --- old/zen-updater-7.1.0/src/UpdaterWindow.cs 2006-03-27 01:10:28.000000000 +0200 +++ new/zen-updater-7.1.0/src/UpdaterWindow.cs 2006-04-03 22:04:53.000000000 +0200 @@ -244,6 +244,8 @@ } public void DisplayAll () { + Present (); + if (resolving || transacting || displaying) return; @@ -458,6 +460,7 @@ private void EndUpdate (bool successful, string reason) { Gtk.Application.Invoke (delegate { + Title = Catalog.GetString ("Software Updater"); if (!successful) { Util.Error (this, Catalog.GetString ("Transaction failed: ") + reason); } @@ -468,8 +471,12 @@ }); } - private void UpdateProgressBar (string text, double percent) { + private void UpdateProgressBar (string text, double percent, bool preparing) { Gtk.Application.Invoke (delegate { + Title = String.Format ("{0} - {1}%", + preparing ? Catalog.GetString ("Preparing Software") : + Catalog.GetString ("Updating Software"), + Math.Round (percent * 100.0)); progressBar.Text = text; progressBar.Fraction = percent; }); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit yast2-packager
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package yast2-packager checked in at Wed Apr 5 01:03:48 CEST 2006. -------- --- yast2-packager/yast2-packager.changes 2006-04-04 17:03:56.000000000 +0200 +++ yast2-packager/yast2-packager.changes 2006-04-04 19:53:40.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Apr 4 19:34:53 CEST 2006 - jsrain(a)suse.de + +- fixed servicepack.tgz integration +- added support for loopback mounted ISO (#159565) +- 2.13.59 + +------------------------------------------------------------------- Old: ---- yast2-packager-2.13.58.tar.bz2 New: ---- yast2-packager-2.13.59.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.9mh8SH/_old 2006-04-05 01:03:43.000000000 +0200 +++ /var/tmp/diff_new_pack.9mh8SH/_new 2006-04-05 01:03:43.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-packager (Version 2.13.58) +# spec file for package yast2-packager (Version 2.13.59) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-packager -Version: 2.13.58 +Version: 2.13.59 Release: 1 License: GPL Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.13.58.tar.bz2 +Source0: yast2-packager-2.13.59.tar.bz2 prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen gcc-c++ libxcrypt-devel libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-country yast2-devtools yast2-installation yast2-testsuite yast2-xml Requires: yast2 yast2-installation checkmedia yast2-country @@ -41,7 +41,7 @@ Arvin Schnell <arvin(a)suse.de> %prep -%setup -n yast2-packager-2.13.58 +%setup -n yast2-packager-2.13.59 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,10 @@ %doc %{prefix}/share/doc/packages/yast2-packager %changelog -n yast2-packager +* Tue Apr 04 2006 - jsrain(a)suse.de +- fixed servicepack.tgz integration +- added support for loopback mounted ISO (#159565) +- 2.13.59 * Tue Apr 04 2006 - mvidner(a)suse.cz - Call rug sa for all known installation sources, using the URL+alias instead of /installation (#156030). ++++++ yast2-packager-2.13.58.tar.bz2 -> yast2-packager-2.13.59.tar.bz2 ++++++ ++++ 2248 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.58/VERSION new/yast2-packager-2.13.59/VERSION --- old/yast2-packager-2.13.58/VERSION 2006-04-04 16:33:47.000000000 +0200 +++ new/yast2-packager-2.13.59/VERSION 2006-04-04 19:51:07.000000000 +0200 @@ -1 +1 @@ -2.13.58 +2.13.59 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.58/configure.in new/yast2-packager-2.13.59/configure.in --- old/yast2-packager-2.13.58/configure.in 2006-04-04 16:35:04.000000000 +0200 +++ new/yast2-packager-2.13.59/configure.in 2006-04-04 19:53:47.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-packager dnl -dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.13.58, http://www.suse.de/feedback, yast2-packager) +AC_INIT(yast2-packager, 2.13.59, http://www.suse.de/feedback, yast2-packager) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.58" +VERSION="2.13.59" RPMNAME="yast2-packager" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.58/src/modules/InstURL.ycp new/yast2-packager-2.13.59/src/modules/InstURL.ycp --- old/yast2-packager-2.13.58/src/modules/InstURL.ycp 2006-03-14 17:25:55.000000000 +0100 +++ new/yast2-packager-2.13.59/src/modules/InstURL.ycp 2006-04-04 19:35:30.000000000 +0200 @@ -6,7 +6,7 @@ * Purpose: Convert /etc/install.inf data to URL * * - * $Id: InstURL.ycp 28928 2006-03-13 22:34:20Z jsrain $ + * $Id: InstURL.ycp 29680 2006-04-04 17:34:37Z jsrain $ */ { @@ -177,7 +177,23 @@ } // is_network + string isoimg = ""; string serverdir = Linuxrc::InstallInf("Serverdir"); + if (Linuxrc::InstallInf("SourceType") == "file") + { + if (serverdir != "" && serverdir != nil) + { + list<string> sd_items = splitstring (serverdir, "/"); + sd_items = filter (string i, sd_items, { + return i != ""; + }); + integer last = size (sd_items) - 1; + isoimg = sd_items[last]:""; + sd_items[last] = ""; + serverdir = mergestring (sd_items, "/"); + } + } + /* if (((instmode == "hd") || is_network) // if serverdir needed && ((serverdir != nil) && (serverdir != ""))) // and is valid @@ -289,6 +305,12 @@ option_separator = "&"; y2milestone ("options %1", options); } + + if (isoimg != "") + { + url = sformat ("iso:/?iso=%1&url=%2", isoimg, url); + } + y2debug ("URL %1", HidePassword(url)); return url; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.58/src/modules/Packages.ycp new/yast2-packager-2.13.59/src/modules/Packages.ycp --- old/yast2-packager-2.13.58/src/modules/Packages.ycp 2006-03-28 15:54:37.000000000 +0200 +++ new/yast2-packager-2.13.59/src/modules/Packages.ycp 2006-04-04 18:05:33.000000000 +0200 @@ -3,7 +3,7 @@ * Package: Package selections * Authors: Anas Nashif <nashif(a)suse.de> * - * $Id: Packages.ycp 29455 2006-03-28 09:32:49Z visnov $ + * $Id: Packages.ycp 29674 2006-04-04 16:04:42Z jsrain $ */ { @@ -11,6 +11,7 @@ textdomain "packager"; + import "AddOnProduct"; import "Arch"; import "Directory"; import "InstURL"; @@ -565,6 +566,29 @@ y2milestone ("No order file, doing single source installation"); theSources = [ initial_source ]; + if (servicepack_available) + { + string spdir = metadir + "/Service-Pack/CD1"; + WFM::Execute (.local.mkdir, spdir); + y2milestone ("Filling %1", spdir); + WFM::Execute(.local.bash, "tar -zxvf " + + servicepack_metadata + " -C " + spdir); + if ((integer)WFM::Read (.local.size, spdir + "/installation.xml") > 0) + { + AddOnProduct::WFIntegrate (spdir + "/installation.xml"); + } + string sp_url = "dir:" + spdir; + integer sp_source = Pkg::SourceCreate (sp_url, ""); + if (sp_source == -1) + Report::Error (_("Failed to integrate service pack source")); + else + { + theSources = add (theSources, sp_source); + y2internal ("Service pack source: %1, changing to URL: %2", sp_source, base_url); + Pkg::SourceChangeUrl (sp_source, base_url); + } + } + if (ProductFeatures::GetFeature ("software", "selection_type") == `fixed) { Pkg::SetSelection (ProductFeatures::GetStringFeature ("software", "base_selection")); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.58/testsuite/tests/insturl-iso.out new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.out --- old/yast2-packager-2.13.58/testsuite/tests/insturl-iso.out 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.out 2006-04-04 18:53:31.000000000 +0200 @@ -0,0 +1,10 @@ +Read .target.tmpdir "/tmp" +Read .target.size "/etc/install.inf" 1 +Dir .etc.install_inf: ["InstMode", "Server", "Serverdir", "SourceType"] +Read .etc.install_inf."InstMode" "nfs" +Read .etc.install_inf."Server" "192.168.1.1" +Read .etc.install_inf."Serverdir" "/install/images/CD1.iso" +Read .etc.install_inf."SourceType" "file" +Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/ +Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test +Return iso:/?iso=CD1.iso&url=nfs://192.168.1.1/install/images/test diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-packager-2.13.58/testsuite/tests/insturl-iso.ycp new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.ycp --- old/yast2-packager-2.13.58/testsuite/tests/insturl-iso.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-packager-2.13.59/testsuite/tests/insturl-iso.ycp 2006-04-04 18:49:13.000000000 +0200 @@ -0,0 +1,25 @@ +{ + include "testsuite.ycp"; + map READ = $[ + "target" : $[ + "size" : 1, + "tmpdir" : "/tmp", + ], + "etc" : $[ + "install_inf": $[ + "InstMode":"nfs", + "Server":"192.168.1.1", + "Serverdir":"/install/images/CD1.iso", + "SourceType":"file", + ] + ] + ]; + + TESTSUITE_INIT ([READ], nil); + import "InstURL"; + import "Linuxrc"; + + TEST (``(InstURL::installInf2Url("")), [READ], nil); + TEST (``(InstURL::installInf2Url("test")), [READ], nil); + TEST (``(InstURL::installInf2Url("/test")), [READ], nil); +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0

commit rug
by root＠suse.de 04 Apr '06

04 Apr '06

Hello community, here is the log from the commit of package rug checked in at Wed Apr 5 01:03:19 CEST 2006. -------- --- rug/rug.changes 2006-04-01 00:09:03.000000000 +0200 +++ rug/rug.changes 2006-04-04 19:51:45.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 4 19:51:18 CEST 2006 - maw(a)suse.de + +- New source drop (r26652) which: +- Prints dependency information in the patch-info command. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rug.spec ++++++ --- /var/tmp/diff_new_pack.p4HiHM/_old 2006-04-05 01:02:21.000000000 +0200 +++ /var/tmp/diff_new_pack.p4HiHM/_new 2006-04-05 01:02:21.000000000 +0200 @@ -14,7 +14,7 @@ BuildRequires: gtkdoc mono-basic mono-data-sqlite mono-devel zmd-devel URL: http://www.novell.com Version: 7.1.1 -Release: 21 +Release: 22 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Command Line Client for zmd @@ -78,6 +78,9 @@ %_mandir/*/*/*.gz %changelog -n rug +* Tue Apr 04 2006 - maw(a)suse.de +- New source drop (r26652) which: +- Prints dependency information in the patch-info command. * Fri Mar 31 2006 - maw(a)suse.de - New source drop (r26568) which: - Backs out the patch status reporting; it requires changes in ++++++ rug-7.1.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/aclocal.m4 new/rug-7.1.1/aclocal.m4 --- old/rug-7.1.1/aclocal.m4 2006-02-17 19:19:36.000000000 +0100 +++ new/rug-7.1.1/aclocal.m4 2006-03-29 19:19:11.000000000 +0200 @@ -44,7 +44,7 @@ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_ifval([$1], [$1], [0.9.0]) + _pkg_min_version=m4_default([$1], [0.9.0]) AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then AC_MSG_RESULT([yes]) @@ -80,14 +80,30 @@ # --------------------------------------------- m4_define([_PKG_CONFIG], [if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else PKG_CHECK_EXISTS([$3], [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], [pkg_failed=yes]) + fi else pkg_failed=untried fi[]dnl ])# _PKG_CONFIG +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], # [ACTION-IF-NOT-FOUND]) # @@ -109,19 +125,30 @@ _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) _PKG_CONFIG([$1][_LIBS], [libs], [$2]) +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + if test $pkg_failed = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met. +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details.])], +_PKG_TEXT +])], [$4]) elif test $pkg_failed = untried; then ifelse([$4], , [AC_MSG_FAILURE(dnl @@ -129,9 +156,7 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details. +_PKG_TEXT To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], [$4]) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/configure new/rug-7.1.1/configure --- old/rug-7.1.1/configure 2006-02-17 19:19:43.000000000 +0100 +++ new/rug-7.1.1/configure 2006-03-29 19:19:14.000000000 +0200 @@ -5280,6 +5280,9 @@ echo $ECHO_N "checking for ZMD... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then + if test -n "$ZMD_CFLAGS"; then + pkg_cv_ZMD_CFLAGS="$ZMD_CFLAGS" + else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"zmd-public zmd-package-management-public\"") >&5 ($PKG_CONFIG --exists --print-errors "zmd-public zmd-package-management-public") 2>&5 @@ -5290,10 +5293,14 @@ else pkg_failed=yes fi + fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then + if test -n "$ZMD_LIBS"; then + pkg_cv_ZMD_LIBS="$ZMD_LIBS" + else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"zmd-public zmd-package-management-public\"") >&5 ($PKG_CONFIG --exists --print-errors "zmd-public zmd-package-management-public") 2>&5 @@ -5304,38 +5311,59 @@ else pkg_failed=yes fi + fi else pkg_failed=untried fi + + if test $pkg_failed = yes; then - ZMD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zmd-public zmd-package-management-public"` + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + ZMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "zmd-public zmd-package-management-public"` + else + ZMD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "zmd-public zmd-package-management-public"` + fi # Put the nasty error message in config.log where it belongs - echo "$ZMD_PKG_ERRORS" 1>&5 + echo "$ZMD_PKG_ERRORS" >&5 + + { { echo "$as_me:$LINENO: error: Package requirements (zmd-public zmd-package-management-public) were not met: + +$ZMD_PKG_ERRORS - { { echo "$as_me:$LINENO: error: Package requirements (zmd-public zmd-package-management-public) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details." >&5 -echo "$as_me: error: Package requirements (zmd-public zmd-package-management-public) were not met. +Alternatively, you may set the environment variables ZMD_CFLAGS +and ZMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&5 +echo "$as_me: error: Package requirements (zmd-public zmd-package-management-public) were not met: + +$ZMD_PKG_ERRORS + Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details." >&2;} +Alternatively, you may set the environment variables ZMD_CFLAGS +and ZMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. +" >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details. +Alternatively, you may set the environment variables ZMD_CFLAGS +and ZMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -5343,9 +5371,9 @@ is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively you may set the ZMD_CFLAGS and ZMD_LIBS environment variables -to avoid the need to call pkg-config. See the pkg-config man page for -more details. +Alternatively, you may set the environment variables ZMD_CFLAGS +and ZMD_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/BuildConfig.cs new/rug-7.1.1/src/BuildConfig.cs --- old/rug-7.1.1/src/BuildConfig.cs 2006-03-31 22:52:00.000000000 +0200 +++ new/rug-7.1.1/src/BuildConfig.cs 2006-04-04 17:04:29.000000000 +0200 @@ -2,10 +2,10 @@ namespace Novell.Zenworks.Rug { public class BuildConfig { - public const string PREFIX = "/usr/local"; - public const string SYSCONFDIR = "/usr/local/etc"; - public const string DATADIR = "/usr/local/share"; - public const string LIBDIR = "/usr/local/lib"; + public const string PREFIX = "/opt/zypp"; + public const string SYSCONFDIR = "/opt/zypp/etc"; + public const string DATADIR = "/opt/zypp/share"; + public const string LIBDIR = "/opt/zypp/lib"; public const string MODULEDIR = LIBDIR + "/rug/modules"; public const string LOCALEDIR = DATADIR + "/locale"; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/ChangeLog new/rug-7.1.1/src/ChangeLog --- old/rug-7.1.1/src/ChangeLog 2006-03-31 22:50:51.000000000 +0200 +++ new/rug-7.1.1/src/ChangeLog 2006-04-04 17:03:52.000000000 +0200 @@ -1,3 +1,13 @@ +2006-04-04 Dan Mills <thunder(a)ximian.com> + + * PackageCommands.cs (FormatDep): Add more dependency target types. + +2006-04-03 Dan Mills <thunder(a)ximian.com> + + * PackageCommands.cs: PackageDepsInfo -> ResolvableDepsInfo. Print + out dependency information in the patch-info command. Make some + strings translatable. + 2006-03-30 Dan Mills <thunder(a)ximian.com> * PackageCommands.cs (GetResolvableStatus): Change strings as diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/rug-7.1.1/src/PackageCommands.cs new/rug-7.1.1/src/PackageCommands.cs --- old/rug-7.1.1/src/PackageCommands.cs 2006-03-31 22:50:51.000000000 +0200 +++ new/rug-7.1.1/src/PackageCommands.cs 2006-04-04 18:39:47.000000000 +0200 @@ -800,8 +800,8 @@ Error (GetString ("--- No packages found ---")); foreach (PackageInfo p in pkgs) { - PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p); - if (depInfo.Equals (PackageDepsInfo.Empty)) + ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p); + if (depInfo.Equals (ResolvableDepsInfo.Empty)) continue; Console.WriteLine (String.Format ("--- {0} {1} ---", p.Name, p.Version)); @@ -854,9 +854,9 @@ Error (GetString ("--- No packages found ---")); foreach (PackageInfo p in pkgs) { - PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p); + ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p); - if (depInfo.Equals (PackageDepsInfo.Empty)) + if (depInfo.Equals (ResolvableDepsInfo.Empty)) continue; Formatter formatter; @@ -959,8 +959,8 @@ Error (GetString ("--- No packages found ---")); foreach (PackageInfo p in pkgs) { - PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p); - if (depInfo.Equals (PackageDepsInfo.Empty)) + ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p); + if (depInfo.Equals (ResolvableDepsInfo.Empty)) continue; Formatter formatter = new Formatter (GetString ("Conflict"), GetString ("Provided By"), @@ -1046,8 +1046,8 @@ Error (GetString ("--- No packages found ---")); foreach (PackageInfo p in pkgs) { - PackageDepsInfo depInfo = pm.GetPackageDependencyInfo (p); - if (depInfo.Equals (PackageDepsInfo.Empty)) + ResolvableDepsInfo depInfo = pm.GetPackageDependencyInfo (p); + if (depInfo.Equals (ResolvableDepsInfo.Empty)) continue; Formatter formatter = new Formatter (GetString ("Obsoletes"), GetString ("Provided By"), @@ -2917,7 +2917,45 @@ } protected static string FormatDep (DepInfo dep) { - string depString = dep.Name; + string depString = ""; + + switch (dep.Target) { + case ResolvableType.Package: + depString += GetString ("package: "); + break; + case ResolvableType.Script: + depString += GetString ("script: "); + break; + case ResolvableType.Message: + depString += GetString ("message: "); + break; + case ResolvableType.Patch: + depString += GetString ("patch: "); + break; + case ResolvableType.Pattern: + depString += GetString ("pattern: "); + break; + case ResolvableType.Product: + depString += GetString ("product: "); + break; + case ResolvableType.Selection: + depString += GetString ("selection: "); + break; + case ResolvableType.Language: + depString += GetString ("language: "); + break; + case ResolvableType.Atom: + depString += GetString ("atom: "); + break; + case ResolvableType.SrcPackage: + depString += GetString ("source: "); + break; + default: + break; + } + + depString += dep.Name; + if (dep.Relation != "any") depString += " " + dep.Relation + " " + dep.Version; @@ -3141,17 +3179,38 @@ Error ("No patch with name '{0}' was found", RemainingArguments[0]); } - Console.WriteLine ("Name: " + patch.Name); - Console.WriteLine ("Version: " + patch.Version); - Console.WriteLine ("Arch: " + patch.Arch); - Console.WriteLine ("Status: " + patch.Status); - Console.WriteLine ("Category: " + patch.Category); - Console.WriteLine ("Created On: " + patch.CreationTime); - Console.WriteLine ("Reboot Required: " + GetBooleanString (patch.RebootRequired)); - Console.WriteLine ("Restart Required: " + GetBooleanString (patch.RestartRequired)); - Console.WriteLine ("Interactive: " + GetBooleanString (patch.IsInteractive)); - Console.WriteLine ("Summary: " + patch.Summary); - Console.WriteLine ("Description: " + patch.Description); + Console.WriteLine (GetString ("Name: ") + patch.Name); + Console.WriteLine (GetString ("Version: ") + patch.Version); + Console.WriteLine (GetString ("Arch: ") + patch.Arch); + Console.WriteLine (GetString ("Status: ") + patch.Status); + Console.WriteLine (GetString ("Category: ") + patch.Category); + Console.WriteLine (GetString ("Created On: ") + patch.CreationTime); + Console.WriteLine (GetString ("Reboot Required: ") + GetBooleanString (patch.RebootRequired)); + Console.WriteLine (GetString ("Restart Required: ") + GetBooleanString (patch.RestartRequired)); + Console.WriteLine (GetString ("Interactive: ") + GetBooleanString (patch.IsInteractive)); + Console.WriteLine (GetString ("Summary: ") + patch.Summary); + Console.WriteLine (GetString ("Description: ") + patch.Description); + + ResolvableDepsInfo info = PackageManager.GetPatchDependencyInfo (patch); + if (info.Provides.Length > 0) { + Console.WriteLine (GetString ("Provides:")); + ShowPackageDeps (info.Provides); + Console.WriteLine (); + } + if (info.Requires.Length > 0) { + Console.WriteLine (GetString ("Requires:")); + ShowPackageDeps (info.Requires); + Console.WriteLine (); + } + if (info.Conflicts.Length > 0) { + Console.WriteLine (GetString ("Conflicts:")); + ShowPackageDeps (info.Conflicts); + Console.WriteLine (); + } + if (info.Obsoletes.Length > 0) { + Console.WriteLine (GetString ("Obsoletes:")); + ShowPackageDeps (info.Obsoletes); + } } } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun...

1 0