Mailinglist Archive: opensuse-commit (1187 mails)
| < Previous | Next > |
commit yast2-pkg-bindings
- From: root@xxxxxxx (h_root)
- Date: Wed, 19 Apr 2006 23:17:25 +0200 (CEST)
- Message-id: <20060419211725.D6CDF8AC00@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Apr 19 23:17:25 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-19 10:36:27.000000000 +0200
+++ STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-19 23:02:40.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Apr 19 23:01:53 CEST 2006 - jsrain@xxxxxxx
+
+- fixed building
+- 2.13.61
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.60.tar.bz2
New:
----
yast2-pkg-bindings-2.13.61.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.YwffS9/_old 2006-04-19 23:16:40.000000000 +0200
+++ /var/tmp/diff_new_pack.YwffS9/_new 2006-04-19 23:16:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.60)
+# spec file for package yast2-pkg-bindings (Version 2.13.61)
#
# 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-pkg-bindings
-Version: 2.13.60
+Version: 2.13.61
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.60.tar.bz2
+Source0: yast2-pkg-bindings-2.13.61.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 libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky <visnov@xxxxxxx>
%prep
-%setup -n yast2-pkg-bindings-2.13.60
+%setup -n yast2-pkg-bindings-2.13.61
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,9 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Wed Apr 19 2006 - jsrain@xxxxxxx
+- fixed building
+- 2.13.61
* Wed Apr 19 2006 - visnov@xxxxxxx
- ignore finish with errors in DonePackage callback to be retried (#161298)
- 2.13.60
++++++ yast2-pkg-bindings-2.13.60.tar.bz2 -> yast2-pkg-bindings-2.13.61.tar.bz2 ++++++
++++ 11447 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-pkg-bindings-2.13.60/VERSION new/yast2-pkg-bindings-2.13.61/VERSION
--- old/yast2-pkg-bindings-2.13.60/VERSION 2006-04-19 10:34:46.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.61/VERSION 2006-04-19 23:02:54.000000000 +0200
@@ -1 +1 @@
-2.13.60
+2.13.61
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-pkg-bindings-2.13.60/configure.in new/yast2-pkg-bindings-2.13.61/configure.in
--- old/yast2-pkg-bindings-2.13.60/configure.in 2006-04-13 15:20:07.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.61/configure.in 2006-04-19 23:03:11.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.58, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.61, http://www.suse.de/feedback, 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.58"
+VERSION="2.13.61"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres <ma@xxxxxxx>"
@@ -158,7 +158,6 @@
AC_HEADER_STDC
-PKG_CHECK_MODULES([ZYPP], [libzypp])
AX_CHECK_DOCBOOK
AC_CONFIG_FILES(Makefile doc/Makefile
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-pkg-bindings-2.13.60/configure.in.in new/yast2-pkg-bindings-2.13.61/configure.in.in
--- old/yast2-pkg-bindings-2.13.60/configure.in.in 2006-03-29 16:44:29.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.61/configure.in.in 2006-04-14 19:26:45.000000000 +0200
@@ -8,7 +8,6 @@
@YAST2-CHECKS-COMMON@
@YAST2-CHECKS-PROGRAM@
-PKG_CHECK_MODULES([ZYPP], [libzypp])
AX_CHECK_DOCBOOK
## and generate the output
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-pkg-bindings-2.13.60/src/Callbacks.YCP.h new/yast2-pkg-bindings-2.13.61/src/Callbacks.YCP.h
--- old/yast2-pkg-bindings-2.13.60/src/Callbacks.YCP.h 2006-04-13 14:32:24.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.61/src/Callbacks.YCP.h 2006-04-19 23:01:06.000000000 +0200
@@ -326,7 +326,9 @@
bool expecting( YCPValueType exp_r ) const {
if ( _result->valuetype() == exp_r )
return true;
- INT << "Wrong return type " << _result->valuetype() << ": Expected " << exp_r << endl;
+ y2internal ("Wrong return type %s: Expected %s", "FIXME__result->valuetype()_FIXME", "FIXME_exp_r_FIXME");
+#warning put the values into code above
+// INT << "Wrong return type " << _result->valuetype() << ": Expected " << exp_r << endl;
return false;
}
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-pkg-bindings-2.13.60/src/Callbacks.cc new/yast2-pkg-bindings-2.13.61/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.60/src/Callbacks.cc 2006-04-19 10:18:01.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.61/src/Callbacks.cc 2006-04-19 22:50:12.000000000 +0200
@@ -852,7 +852,7 @@
KeyRingReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
virtual bool askUserToTrustKey( const std::string &keyid
- , const std::string &keyname, const std::string &keydetails )
+ , const std::string &keyname, const std::string &fingerprint )
{
CB callback( ycpcb( YCPCallbacks::CB_ImportGpgKey) );
@@ -860,16 +860,16 @@
{
callback.addStr(keyid);
callback.addStr(keyname);
- callback.addStr(keydetails);
-
+ callback.addStr(fingerprint);
+
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname, keydetails);
+ return zypp::KeyRingReport::askUserToTrustKey(keyid, keyname, fingerprint);
}
virtual bool askUserToAcceptUnknownKey( const zypp::Pathname &path,
- const std::string &keyid, const std::string &keyname )
+ const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptUnknownGpgKey) );
@@ -878,11 +878,12 @@
callback.addStr(path.asString());
callback.addStr(keyid);
callback.addStr(keyname);
+ callback.addStr(fingerprint);
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToAcceptUnknownKey(path, keyid, keyname);
+ return zypp::KeyRingReport::askUserToAcceptUnknownKey(path, keyid, keyname, fingerprint );
}
virtual bool askUserToAcceptUnsignedFile( const zypp::Pathname &file )
@@ -900,7 +901,7 @@
}
virtual bool askUserToAcceptVerificationFailed( const zypp::Pathname &file,
- const std::string &keyid, const std::string &keyname )
+ const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptVerificationFailed) );
@@ -909,11 +910,12 @@
callback.addStr(file.asString());
callback.addStr(keyid);
callback.addStr(keyname);
+ callback.addStr(fingerprint);
return callback.evaluateBool();
}
- return zypp::KeyRingReport::askUserToAcceptVerificationFailed(file, keyid, keyname);
+ return zypp::KeyRingReport::askUserToAcceptVerificationFailed(file, keyid, keyname, fingerprint);
}
};
@@ -924,7 +926,7 @@
{
KeyRingSignal ( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
- virtual void trustedKeyAdded( const zypp::KeyRing &keyring, const std::string &keyid, const std::string &keyname )
+ virtual void trustedKeyAdded( const zypp::KeyRing &keyring, const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
{
CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyAdded) );
@@ -932,10 +934,11 @@
{
callback.addStr(keyid);
callback.addStr(keyname);
+ callback.addStr(fingerprint);
}
}
- virtual void trustedKeyRemoved( const zypp::KeyRing &keyring, const std::string &keyid, const std::string &keyname )
+ virtual void trustedKeyRemoved( const zypp::KeyRing &keyring, const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
{
CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyRemoved) );
@@ -943,6 +946,7 @@
{
callback.addStr(keyid);
callback.addStr(keyname);
+ callback.addStr(fingerprint);
}
}
};
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-pkg-bindings-2.13.60/src/Package.cc new/yast2-pkg-bindings-2.13.61/src/Package.cc
--- old/yast2-pkg-bindings-2.13.60/src/Package.cc 2006-04-13 14:32:24.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.61/src/Package.cc 2006-04-19 22:58:11.000000000 +0200
@@ -555,7 +555,9 @@
{
// regarding items which are installable only
if (!provider->arch().compatibleWith( _architecture )) {
- MIL << "provider " << provider << " has incompatible arch '" << provider->arch() << "'" << endl;
+ y2milestone ("provider %s has incompatible arch '%s'", "FIXME_provider_FIXME", provider->arch().asString().c_str());
+#warning component provider into the message above
+// MIL << "provider " << provider << " has incompatible arch '" << provider->arch() << "'" << endl;
}
else if (!item) { // no provider yet
item = provider;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
| < Previous | Next > |