Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Aug 30 10:04:32 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-08-22 15:07:25.000000000 +0200
+++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-08-30 09:52:16.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 30 09:35:41 CEST 2006 - lslezak@suse.cz
+
+- synced to the new zypp API (keyring, callbacks)
+- require libzypp >= 2.0.0 (#202397)
+- 2.13.94
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.93.tar.bz2
New:
----
yast2-pkg-bindings-2.13.94.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.UQHeNV/_old 2006-08-30 10:04:17.000000000 +0200
+++ /var/tmp/diff_new_pack.UQHeNV/_new 2006-08-30 10:04:17.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.93)
+# spec file for package yast2-pkg-bindings (Version 2.13.94)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,16 +11,18 @@
# norootforbuild
Name: yast2-pkg-bindings
-Version: 2.13.93
+Version: 2.13.94
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.93.tar.bz2
+Source0: yast2-pkg-bindings-2.13.94.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 2.0.0
BuildRequires: libzypp >= 2.0.0
+# new API (delta and patch rpms, keyring, target...)
+Requires: libzypp >= 2.0.0
Summary: YaST2 Package Manager Access
%description
@@ -38,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.13.93
+%setup -n yast2-pkg-bindings-2.13.94
%build
%{prefix}/bin/y2tool y2autoconf
@@ -69,6 +71,10 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Wed Aug 30 2006 - lslezak@suse.cz
+- synced to the new zypp API (keyring, callbacks)
+- require libzypp >= 2.0.0 (#202397)
+- 2.13.94
* Mon Aug 21 2006 - lslezak@suse.cz
- new bindings SourceRestore() and SourceLoad() (#199738)
- TargetInitDU([]) sets the current disk usage (#197497)
++++++ yast2-pkg-bindings-2.13.93.tar.bz2 -> yast2-pkg-bindings-2.13.94.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.93/VERSION new/yast2-pkg-bindings-2.13.94/VERSION
--- old/yast2-pkg-bindings-2.13.93/VERSION 2006-08-22 14:51:39.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.94/VERSION 2006-08-30 08:36:33.000000000 +0200
@@ -1 +1 @@
-2.13.93
+2.13.94
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.93/configure new/yast2-pkg-bindings-2.13.94/configure
--- old/yast2-pkg-bindings-2.13.93/configure 2006-08-22 15:05:06.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.94/configure 2006-08-30 09:47:06.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.93.
+# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.94.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.13.93'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.93'
+PACKAGE_VERSION='2.13.94'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.94'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -971,7 +971,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-pkg-bindings 2.13.93 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.94 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1038,7 +1038,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.93:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.94:";;
esac
cat <<\_ACEOF
@@ -1184,7 +1184,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.13.93
+yast2-pkg-bindings configure 2.13.94
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1198,7 +1198,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-pkg-bindings $as_me 2.13.93, which was
+It was created by yast2-pkg-bindings $as_me 2.13.94, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1928,7 +1928,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.13.93'
+ VERSION='2.13.94'
cat >>confdefs.h <<_ACEOF
@@ -2139,7 +2139,7 @@
-VERSION="2.13.93"
+VERSION="2.13.94"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -20273,7 +20273,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-pkg-bindings $as_me 2.13.93, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.94, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20336,7 +20336,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.13.93
+yast2-pkg-bindings config.status 2.13.94
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/yast2-pkg-bindings-2.13.93/configure.in new/yast2-pkg-bindings-2.13.94/configure.in
--- old/yast2-pkg-bindings-2.13.93/configure.in 2006-08-22 15:04:52.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.94/configure.in 2006-08-30 09:46:51.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.93, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.94, http://bugs.opensuse.org/, yast2-pkg-bindings)
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.93"
+VERSION="2.13.94"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.93/src/Callbacks.cc new/yast2-pkg-bindings-2.13.94/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.93/src/Callbacks.cc 2006-08-11 09:41:48.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.94/src/Callbacks.cc 2006-08-30 09:14:44.000000000 +0200
@@ -981,7 +981,7 @@
}
}
- virtual bool progressData(int value, zypp::Url url)
+ virtual bool progress(int value, zypp::Url url)
{
CB callback( ycpcb( YCPCallbacks::CB_SourceCreateProgressData ) );
@@ -995,7 +995,7 @@
return callback.evaluateBool();
}
- return zypp::source::CreateSourceReport::progressData(value, url);
+ return zypp::source::CreateSourceReport::progress(value, url);
}
std::string CreateSrcErrorAsString(zypp::source::CreateSourceReport::Error error)
@@ -1147,24 +1147,23 @@
{
KeyRingReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
- virtual bool askUserToTrustKey( const std::string &keyid
- , const std::string &keyname, const std::string &fingerprint )
+ virtual bool askUserToTrustKey(const zypp::PublicKey& key)
{
CB callback( ycpcb( YCPCallbacks::CB_ImportGpgKey) );
if (callback._set)
{
- callback.addStr(keyid);
- callback.addStr(keyname);
- callback.addStr(fingerprint);
+ callback.addStr(key.id());
+ callback.addStr(key.name());
+ callback.addStr(key.fingerprint());
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname, fingerprint);
+ return zypp::KeyRingReport::askUserToTrustKey(key);
}
- virtual bool askUserToAcceptUnknownKey(const std::string &file, const std::string &keyid, const std::string &keyname, const std::string &fingerprint)
+ virtual bool askUserToAcceptUnknownKey(const std::string &file, const std::string &keyid)
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptUnknownGpgKey) );
@@ -1172,13 +1171,15 @@
{
callback.addStr(file);
callback.addStr(keyid);
- callback.addStr(keyname);
- callback.addStr(fingerprint);
+
+ // TODO FIXME: zypp now provides just 2
+ callback.addStr(std::string() /*keyname*/);
+ callback.addStr(std::string() /*fingerprint*/);
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToAcceptUnknownKey(file, keyid, keyname, fingerprint );
+ return zypp::KeyRingReport::askUserToAcceptUnknownKey(file, keyid);
}
virtual bool askUserToAcceptUnsignedFile(const std::string &file)
@@ -1195,22 +1196,21 @@
return zypp::KeyRingReport::askUserToAcceptUnsignedFile(file);
}
- virtual bool askUserToAcceptVerificationFailed(const std::string &file,
- const std::string &keyid, const std::string &keyname, const std::string &fingerprint)
+ virtual bool askUserToAcceptVerificationFailed(const std::string &file, const zypp::PublicKey &key)
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptVerificationFailed) );
if (callback._set)
{
callback.addStr(file);
- callback.addStr(keyid);
- callback.addStr(keyname);
- callback.addStr(fingerprint);
+ callback.addStr(key.id());
+ callback.addStr(key.name());
+ callback.addStr(key.fingerprint());
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToAcceptVerificationFailed(file, keyid, keyname, fingerprint);
+ return zypp::KeyRingReport::askUserToAcceptVerificationFailed(file, key);
}
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.93/src/Keyring.cc new/yast2-pkg-bindings-2.13.94/src/Keyring.cc
--- old/yast2-pkg-bindings-2.13.93/src/Keyring.cc 2006-06-29 08:53:04.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.94/src/Keyring.cc 2006-08-24 16:17:35.000000000 +0200
@@ -51,7 +51,10 @@
try
{
- zypp_ptr()->keyRing()->importKey(file, trusted_key);
+ zypp::Pathname pname(file);
+ zypp::PublicKey pubkey(pname);
+
+ zypp_ptr()->keyRing()->importKey(pubkey, trusted_key);
}
catch (...)
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org