![](https://seccdn.libravatar.org/avatar/af22e20b6884acbc89be6d7736c43e92.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package zypper checked in at Mon Nov 20 15:44:20 CET 2006. -------- --- zypper/zypper.changes 2006-11-15 14:41:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2006-11-20 13:56:00.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Nov 20 13:55:28 CET 2006 - mvidner@suse.cz + +- update -t package: keep the same architecture (#222140). +- 0.6.12 + +------------------------------------------------------------------- +Wed Nov 15 16:48:13 CET 2006 - mvidner@suse.cz + +- Resurrected /usr/bin/installation_sources, as a shell wrapper for + zypper (#163737). +- 0.6.11 + +------------------------------------------------------------------- Old: ---- zypper-0.6.10.tar.bz2 New: ---- zypper-0.6.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.4mj8SC/_old 2006-11-20 15:43:14.000000000 +0100 +++ /var/tmp/diff_new_pack.4mj8SC/_new 2006-11-20 15:43:14.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 0.6.10) +# spec file for package zypper (Version 0.6.12) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,9 +21,9 @@ Autoreqprov: on PreReq: permissions Summary: Command Line Package Management Using Libzypp -Version: 0.6.10 +Version: 0.6.12 Release: 1 -Source: zypper-0.6.10.tar.bz2 +Source: zypper-0.6.12.tar.bz2 Prefix: /usr # zypper is not a fully featured replacement yet #Provides: y2pmsh @@ -81,6 +81,7 @@ %defattr(-,root,root) %{_sysconfdir}/logrotate.d/zypper.lr %{_bindir}/zypper +%{_bindir}/installation_sources %if %suse_version > 1010 %{_sbindir}/zypp-checkpatches %verify(not mode) %attr (755,root,root) %{_sbindir}/zypp-checkpatches-wrapper @@ -91,6 +92,13 @@ %doc %{_datadir}/doc/packages/zypper/zypper-rug %changelog -n zypper +* Mon Nov 20 2006 - mvidner@suse.cz +- update -t package: keep the same architecture (#222140). +- 0.6.12 +* Wed Nov 15 2006 - mvidner@suse.cz +- Resurrected /usr/bin/installation_sources, as a shell wrapper for + zypper (#163737). +- 0.6.11 * Wed Nov 15 2006 - mvidner@suse.cz - service-add: added options --type (especially for Plaindir, [#174369]), --disabled, and --no-refresh. ++++++ zypper-0.6.10.tar.bz2 -> zypper-0.6.12.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/Makefile.am new/zypper-0.6.12/Makefile.am --- old/zypper-0.6.10/Makefile.am 2006-11-05 23:07:54.000000000 +0100 +++ new/zypper-0.6.12/Makefile.am 2006-11-20 14:02:08.000000000 +0100 @@ -29,6 +29,7 @@ rm -f package/*.auto mv $(distdir).tar.bz2 package/ mv @PACKAGE@.spec package/ + $(INSTALL_DATA) -p $(srcdir)/package/@PACKAGE@.changes package/ check-up-to-date: cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/Makefile.in new/zypper-0.6.12/Makefile.in --- old/zypper-0.6.10/Makefile.in 2006-11-15 14:42:14.000000000 +0100 +++ new/zypper-0.6.12/Makefile.in 2006-11-20 14:02:24.000000000 +0100 @@ -662,6 +662,7 @@ rm -f package/*.auto mv $(distdir).tar.bz2 package/ mv @PACKAGE@.spec package/ + $(INSTALL_DATA) -p $(srcdir)/package/@PACKAGE@.changes package/ check-up-to-date: cd $(srcdir) && ! LC_ALL=C svn status --show-updates --quiet | grep -v '^Status against revision' diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/VERSION new/zypper-0.6.12/VERSION --- old/zypper-0.6.10/VERSION 2006-11-15 14:38:48.000000000 +0100 +++ new/zypper-0.6.12/VERSION 2006-11-20 13:53:50.000000000 +0100 @@ -10,5 +10,5 @@ dnl ================================================== m4_define([ZYPPER_MAJOR], [0]) m4_define([ZYPPER_MINOR], [6]) -m4_define([ZYPPER_PATCH], [10]) +m4_define([ZYPPER_PATCH], [12]) dnl ================================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/configure new/zypper-0.6.12/configure --- old/zypper-0.6.10/configure 2006-11-15 14:42:12.000000000 +0100 +++ new/zypper-0.6.12/configure 2006-11-20 13:58:15.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for zypper 0.6.10. +# Generated by GNU Autoconf 2.59 for zypper 0.6.12. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -421,8 +421,8 @@ # Identity of this package. PACKAGE_NAME='zypper' PACKAGE_TARNAME='zypper' -PACKAGE_VERSION='0.6.10' -PACKAGE_STRING='zypper 0.6.10' +PACKAGE_VERSION='0.6.12' +PACKAGE_STRING='zypper 0.6.12' PACKAGE_BUGREPORT='' ac_unique_file="src/Makefile.am" @@ -969,7 +969,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zypper 0.6.10 to adapt to many kinds of systems. +\`configure' configures zypper 0.6.12 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1036,7 +1036,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zypper 0.6.10:";; + short | recursive ) echo "Configuration of zypper 0.6.12:";; esac cat <<\_ACEOF @@ -1186,7 +1186,7 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -zypper configure 0.6.10 +zypper configure 0.6.12 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1200,7 +1200,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zypper $as_me 0.6.10, which was +It was created by zypper $as_me 0.6.12, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1929,7 +1929,7 @@ # Define the identity of the package. PACKAGE='zypper' - VERSION='0.6.10' + VERSION='0.6.12' cat >>confdefs.h <<_ACEOF @@ -22164,7 +22164,7 @@ } >&5 cat >&5 <<_CSEOF -This file was extended by zypper $as_me 0.6.10, which was +This file was extended by zypper $as_me 0.6.12, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22227,7 +22227,7 @@ cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -zypper config.status 0.6.10 +zypper config.status 0.6.12 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/src/Makefile.am new/zypper-0.6.12/src/Makefile.am --- old/zypper-0.6.10/src/Makefile.am 2006-11-06 10:54:37.000000000 +0100 +++ new/zypper-0.6.12/src/Makefile.am 2006-11-20 14:14:59.000000000 +0100 @@ -2,6 +2,8 @@ ## ################################################## bin_PROGRAMS = zypper +dist_bin_SCRIPTS = installation_sources + if BUILD_CHECKPATCHES sbin_PROGRAMS = zypp-checkpatches zypp-checkpatches-wrapper endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/src/Makefile.in new/zypper-0.6.12/src/Makefile.in --- old/zypper-0.6.10/src/Makefile.in 2006-11-15 14:42:14.000000000 +0100 +++ new/zypper-0.6.12/src/Makefile.in 2006-11-20 14:17:29.000000000 +0100 @@ -15,6 +15,7 @@ @SET_MAKE@ + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -43,7 +44,8 @@ @BUILD_CHECKPATCHES_TRUE@ zypp-checkpatches-wrapper$(EXEEXT) noinst_PROGRAMS = zmart$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(dist_bin_SCRIPTS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ @@ -57,7 +59,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" \ - "$(DESTDIR)$(logrotatedir)" + "$(DESTDIR)$(bindir)" "$(DESTDIR)$(logrotatedir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) sbinPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(sbin_PROGRAMS) @@ -94,6 +96,8 @@ zypper-info.$(OBJEXT) zypper-getopt.$(OBJEXT) zypper_OBJECTS = $(am_zypper_OBJECTS) zypper_DEPENDENCIES = $(am__DEPENDENCIES_1) +dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT) +SCRIPTS = $(dist_bin_SCRIPTS) DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -254,6 +258,7 @@ target_cpu = @target_cpu@ target_os = @target_os@ target_vendor = @target_vendor@ +dist_bin_SCRIPTS = installation_sources logrotatedir = $(sysconfdir)/logrotate.d logrotate_DATA = zypper.lr AM_CPPFLAGS = $(ZYPP_CFLAGS) @@ -424,6 +429,25 @@ zypper$(EXEEXT): $(zypper_OBJECTS) $(zypper_DEPENDENCIES) @rm -f zypper$(EXEEXT) $(CXXLINK) $(zypper_LDFLAGS) $(zypper_OBJECTS) $(zypper_LDADD) $(LIBS) +install-dist_binSCRIPTS: $(dist_bin_SCRIPTS) + @$(NORMAL_INSTALL) + test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)" + @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + if test -f $$d$$p; then \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " $(dist_binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ + $(dist_binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ + else :; fi; \ + done + +uninstall-dist_binSCRIPTS: + @$(NORMAL_UNINSTALL) + @list='$(dist_bin_SCRIPTS)'; for p in $$list; do \ + f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ + echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ + rm -f "$(DESTDIR)$(bindir)/$$f"; \ + done mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -591,9 +615,9 @@ done check-am: all-am check: check-am -all-am: Makefile $(PROGRAMS) $(DATA) +all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(logrotatedir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(logrotatedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -643,7 +667,8 @@ install-data-am: install-logrotateDATA -install-exec-am: install-binPROGRAMS install-sbinPROGRAMS +install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \ + install-sbinPROGRAMS install-info: install-info-am @@ -669,22 +694,24 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am \ - uninstall-logrotateDATA uninstall-sbinPROGRAMS +uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \ + uninstall-info-am uninstall-logrotateDATA \ + uninstall-sbinPROGRAMS .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ clean-generic clean-libtool clean-noinstPROGRAMS \ clean-sbinPROGRAMS ctags distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-exec \ - install-exec-am install-info install-info-am \ - install-logrotateDATA install-man install-sbinPROGRAMS \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am \ + install-binPROGRAMS install-data install-data-am \ + install-dist_binSCRIPTS install-exec install-exec-am \ + install-info install-info-am install-logrotateDATA install-man \ + install-sbinPROGRAMS install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags uninstall uninstall-am uninstall-binPROGRAMS \ + uninstall-dist_binSCRIPTS uninstall-info-am \ uninstall-logrotateDATA uninstall-sbinPROGRAMS # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/src/installation_sources new/zypper-0.6.12/src/installation_sources --- old/zypper-0.6.10/src/installation_sources 1970-01-01 01:00:00.000000000 +0100 +++ new/zypper-0.6.12/src/installation_sources 2006-11-15 16:25:15.000000000 +0100 @@ -0,0 +1,28 @@ +#!/bin/sh +# this is a compatibility replacement for a C++ program +# that was in yast2-packagemanager.rpm + +ZYPPER=zypper +if [ "x$1" = "x-s" ]; then + exec $ZYPPER service-list +fi + +if [ "x$1" = "x-e" ]; then + shift # do nothing, enabled is default +elif [ "x$1" = "x-d" ]; then + ENABLED=--disable + shift +fi + +if [ "x$1" = "x-a" -a -n "$2" ]; then + exec $ZYPPER service-add $ENABLED "$2" +fi + +cat >&2 <<EOF +Usage: + installation_sources [-e|-d] -a url Add source at given URL. + -e Enable source. This is the default. + -d Disable source. + installation_sources -s Show all available sources. +EOF +exit 1 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/src/zmart-misc.cc new/zypper-0.6.12/src/zmart-misc.cc --- old/zypper-0.6.10/src/zmart-misc.cc 2006-11-13 14:46:10.000000000 +0100 +++ new/zypper-0.6.12/src/zmart-misc.cc 2006-11-20 13:39:54.000000000 +0100 @@ -499,6 +499,51 @@ cout << tbl; } +// collect items, select best edition. +class LookForArchUpdate : public zypp::resfilter::PoolItemFilterFunctor +{ +public: + PoolItem_Ref uninstalled; + + bool operator()( PoolItem_Ref provider ) + { + if (!provider.status().isLocked() // is not locked (taboo) + && (!uninstalled // first match + // or a better edition than candidate + || uninstalled->edition().compare( provider->edition() ) < 0)) + { + uninstalled = provider; // store + } + return true; // keep going + } +}; + +// Find best (according to edition) uninstalled item +// with same kind/name/arch as item. +// Similar to zypp::solver::detail::Helper::findUpdateItem +// but that allows changing the arch (#222140). +static +PoolItem_Ref +findArchUpdateItem (const ResPool & pool, PoolItem_Ref item) +{ + LookForArchUpdate info; + + invokeOnEach( pool.byNameBegin( item->name() ), + pool.byNameEnd( item->name() ), + // get uninstalled, equal kind and arch, better edition + functor::chain ( + functor::chain ( + functor::chain ( + resfilter::ByUninstalled (), + resfilter::ByKind( item->kind() ) ), + resfilter::byArch<CompareByEQ<Arch> >( item->arch() ) ), + resfilter::byEdition<CompareByGT<Edition> >( item->edition() )), + functor::functorRef<bool,PoolItem> (info) ); + + _XDEBUG("findArchUpdateItem(" << item << ") => " << info.uninstalled); + return info.uninstalled; +} + typedef set<PoolItem_Ref> Candidates; void find_updates( const ResObject::Kind &kind, Candidates &candidates ) @@ -513,7 +558,7 @@ if (it->status().isUninstalled()) continue; // (actually similar to ProvideProcess?) - PoolItem_Ref candidate = solver::detail::Helper::findUpdateItem (pool, *it); + PoolItem_Ref candidate = findArchUpdateItem (pool, *it); if (!candidate.resolvable()) continue; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-0.6.10/zypper.spec.in new/zypper-0.6.12/zypper.spec.in --- old/zypper-0.6.10/zypper.spec.in 2006-11-10 10:50:12.000000000 +0100 +++ new/zypper-0.6.12/zypper.spec.in 2006-11-15 16:42:29.000000000 +0100 @@ -78,6 +78,7 @@ %defattr(-,root,root) %{_sysconfdir}/logrotate.d/zypper.lr %{_bindir}/zypper +%{_bindir}/installation_sources %if %suse_version > 1010 %{_sbindir}/zypp-checkpatches %verify(not mode) %attr (755,root,root) %{_sbindir}/zypp-checkpatches-wrapper ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org