Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Thu Jul 23 16:56:42 CEST 2009.
--------
--- libzypp/libzypp.changes 2009-07-16 10:42:25.000000000 +0200
+++ libzypp/libzypp.changes 2009-07-16 17:40:30.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Jul 16 17:05:27 CEST 2009 - dmacvicar@suse.de
+
+- add support to the package-manager script to use kpackagekit
+ or gnome-packagekit if available, which allows to install local
+ rpms with one click from file manager following desktop policies
+ and fetching other dependencies if required.
+ (fate #306526)
+- version 6.10.5 (10)
+
+-------------------------------------------------------------------
+Thu Jul 16 16:25:24 CEST 2009 - ma@suse.de
+
+- New solver.upgradeTestcasesToKeep option in zypp.conf. It tells
+ how many dist upgrade solver testcases should be kept on the system.
+ Per default just the last two are kept.
+- version 6.10.4 (10)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-6.10.3.tar.bz2
New:
----
libzypp-6.10.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.QOtmvV/_old 2009-07-23 16:49:08.000000000 +0200
+++ /var/tmp/diff_new_pack.QOtmvV/_new 2009-07-23 16:49:08.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libzypp (Version 6.10.3)
+# spec file for package libzypp (Version 6.10.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
AutoReqProv: on
Summary: Package, Patch, Pattern, and Product Management
-Version: 6.10.3
+Version: 6.10.5
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
++++++ libzypp-6.10.3.tar.bz2 -> libzypp-6.10.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.10.3/VERSION.cmake new/libzypp-6.10.5/VERSION.cmake
--- old/libzypp-6.10.3/VERSION.cmake 2009-07-16 09:31:57.000000000 +0200
+++ new/libzypp-6.10.5/VERSION.cmake 2009-07-20 01:25:38.000000000 +0200
@@ -61,8 +61,8 @@
SET(LIBZYPP_MAJOR "6")
SET(LIBZYPP_COMPATMINOR "10")
SET(LIBZYPP_MINOR "10")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_PATCH "5")
#
-# LAST RELEASED: 6.10.3 (10)
+# LAST RELEASED: 6.10.4 (10)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.10.3/package/libzypp.changes new/libzypp-6.10.5/package/libzypp.changes
--- old/libzypp-6.10.3/package/libzypp.changes 2009-07-16 09:31:58.000000000 +0200
+++ new/libzypp-6.10.5/package/libzypp.changes 2009-07-20 01:25:38.000000000 +0200
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Thu Jul 16 17:05:27 CEST 2009 - dmacvicar@suse.de
+
+- add support to the package-manager script to use kpackagekit
+ or gnome-packagekit if available, which allows to install local
+ rpms with one click from file manager following desktop policies
+ and fetching other dependencies if required.
+ (fate #306526)
+- version 6.10.5 (10)
+
+-------------------------------------------------------------------
+Thu Jul 16 16:25:24 CEST 2009 - ma@suse.de
+
+- New solver.upgradeTestcasesToKeep option in zypp.conf. It tells
+ how many dist upgrade solver testcases should be kept on the system.
+ Per default just the last two are kept.
+- version 6.10.4 (10)
+
+-------------------------------------------------------------------
Wed Jul 15 17:53:43 CEST 2009 - ma@suse.de
- Don't write a solver testcase when solving for dist upgrade,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.10.3/tools/NameReqPrv.cc new/libzypp-6.10.5/tools/NameReqPrv.cc
--- old/libzypp-6.10.3/tools/NameReqPrv.cc 2009-07-16 09:31:58.000000000 +0200
+++ new/libzypp-6.10.5/tools/NameReqPrv.cc 2009-07-20 01:25:38.000000000 +0200
@@ -176,7 +176,15 @@
for_( it, q.begin(), q.end() )
{
- message << " " << dump(it) << endl;
+ message << " " << *it << "(" << it->vendor() << ")";
+ if ( ! it.matchesEmpty() )
+ {
+ for_( match, it.matchesBegin(), it.matchesEnd() )
+ {
+ message << endl << " " << match->inSolvAttr() << "\t" << match->asString();
+ }
+ }
+ message << endl;
}
message << "}" << endl;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.10.3/tools/package-manager/package-manager new/libzypp-6.10.5/tools/package-manager/package-manager
--- old/libzypp-6.10.3/tools/package-manager/package-manager 2009-07-16 09:31:58.000000000 +0200
+++ new/libzypp-6.10.5/tools/package-manager/package-manager 2009-07-20 01:25:38.000000000 +0200
@@ -21,6 +21,7 @@
done
}
+# check what we have
HAVE_ZLM=false
if rpm -q zen-updater >/dev/null; then
HAVE_ZLM=true
@@ -29,6 +30,14 @@
if rpm -q yast2-packager >/dev/null; then
HAVE_OPENSUSE=true
fi
+HAVE_KPACKAGEKIT=false
+if rpm -q kpackagekit >/dev/null; then
+ HAVE_KPACKAGEKIT=true
+fi
+HAVE_GPACKAGEKIT=false
+if rpm -q gnome-packagekit >/dev/null; then
+ HAVE_GPACKAGEKIT=true
+fi
if $HAVE_ZLM; then
if $HAVE_OPENSUSE; then
@@ -58,6 +67,23 @@
fi
fi
+METHOD=yast
+# determine what we can use
+if [[ $HAVE_KPACKAGEKIT && $KDE_FULL_SESSION ]]
+then
+ METHOD=kpackagekit
+elif [[ $HAVE_GPACKAGEKIT && "$WINDOWMANAGER" == "/usr/bin/gnome" ]]
+then
+ METHOD=gnome-packagekit
+else
+ if [ "$STACK" == "zlm" ]; then
+ METHOD="zlm"
+ else
+ METHOD="yast"
+ fi
+fi
+
+
xsu() {
# a copy of xdg-su.
package-manager-su -c "$(mkCmd "$@")"
@@ -66,27 +92,49 @@
# do_* fall back to yast for STACK=ugh
do_update() {
- if [ $STACK = zlm ]; then
- zen-updater --no-tray "$@"
- else
- xsu /sbin/yast2 --update "$@"
- fi
+ case "${METHOD}" in
+ yast)
+ xsu /sbin/yast2 --update "$@"
+ ;;
+ zlm)
+ zen-updater --no-tray "$@"
+ ;;
+ kpackagekit)
+ kpackagekit --updates "$@"
+ ;;
+ gnome-packagekit)
+ /usr/bin/gpk-update-viewer2 "$@"
+ ;;
+ esac
}
do_remove() {
- if [ $STACK = zlm ]; then
- zen-remover "$@"
- else
- xsu /sbin/yast2 --remove "$@"
- fi
+ # not all support remove
+ case "${METHOD}" in
+ yast|kpackagekit|gnome-packagekit)
+ xsu /sbin/yast2 --remove "$@"
+ ;;
+ zlm)
+ zen-remover "$@"
+ ;;
+ esac
}
do_install() {
- if [ $STACK = zlm ]; then
- zen-installer "$@"
- else
- xsu /sbin/yast2 --install "$@"
- fi
+ case "${METHOD}" in
+ yast)
+ xsu /sbin/yast2 --install "$@"
+ ;;
+ zlm)
+ zen-installer "$@"
+ ;;
+ kpackagekit)
+ kpackagekit "$@"
+ ;;
+ gnome-packagekit)
+ /usr/bin/gpk-install-local-file "$@"
+ ;;
+ esac
}
if [ "x$1" = "x--update" -a $# = 2 ]; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.10.3/zypp/ZConfig.cc new/libzypp-6.10.5/zypp/ZConfig.cc
--- old/libzypp-6.10.3/zypp/ZConfig.cc 2009-07-16 09:31:57.000000000 +0200
+++ new/libzypp-6.10.5/zypp/ZConfig.cc 2009-07-20 01:25:37.000000000 +0200
@@ -13,6 +13,7 @@
{
#include