Hello community,
here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Wed Sep 14 14:58:04 CEST 2011.
--------
--- libzypp/libzypp.changes 2011-08-31 14:53:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2011-09-13
13:53:06.000000000 +0200
@@ -1,0 +2,47 @@
+Tue Sep 13 10:51:53 CEST 2011 - m...@suse.de
+
+- Enhance Selectable API
+- version 9.11.0 (8)
+
+-------------------------------------------------------------------
+Sun Sep 11 01:18:59 CEST 2011 - m...@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Sep 11 01:13:12 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 8 01:19:28 CEST 2011 - m...@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 8 01:14:08 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Wed Sep 7 12:38:23 CEST 2011 - m...@suse.de
+
+- Explicitly require rpm.
+- version 9.10.2 (8)
+
+-------------------------------------------------------------------
+Sun Sep 4 01:16:54 CEST 2011 - m...@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Sep 4 01:13:27 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 1 01:13:36 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libzypp-9.10.2.tar.bz2
New:
----
libzypp-9.11.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.8PN7ww/_old 2011-09-14 14:57:59.000000000 +0200
+++ /var/tmp/diff_new_pack.8PN7ww/_new 2011-09-14 14:57:59.000000000 +0200
@@ -23,7 +23,7 @@
Group: System/Packages
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Package, Patch, Pattern, and Product Management
-Version: 9.10.2
+Version: 9.11.0
Release: 1
Source: %{name}-%{version}.tar.bz2
Source1: %{name}-rpmlintrc
@@ -74,6 +74,8 @@
BuildRequires: expat-devel
%endif
+Requires: rpm
+
%if 0%{?suse_version}
BuildRequires: rpm-devel
Requires: /usr/bin/uuidgen
++++++ libzypp-9.10.2.tar.bz2 -> libzypp-9.11.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.10.2/VERSION.cmake
new/libzypp-9.11.0/VERSION.cmake
--- old/libzypp-9.10.2/VERSION.cmake 2011-08-31 14:28:18.000000000 +0200
+++ new/libzypp-9.11.0/VERSION.cmake 2011-09-13 13:47:48.000000000 +0200
@@ -60,9 +60,9 @@
#
SET(LIBZYPP_MAJOR "9")
SET(LIBZYPP_COMPATMINOR "8")
-SET(LIBZYPP_MINOR "10")
-SET(LIBZYPP_PATCH "2")
+SET(LIBZYPP_MINOR "11")
+SET(LIBZYPP_PATCH "0")
#
-# LAST RELEASED: 9.10.2 (8)
+# LAST RELEASED: 9.11.0 (8)
# (The number in parenthesis is LIBZYPP_COMPATMINOR)
#=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.10.2/libzypp.spec.cmake
new/libzypp-9.11.0/libzypp.spec.cmake
--- old/libzypp-9.10.2/libzypp.spec.cmake 2011-08-31 14:28:18.000000000
+0200
+++ new/libzypp-9.11.0/libzypp.spec.cmake 2011-09-13 13:47:48.000000000
+0200
@@ -66,6 +66,8 @@
BuildRequires: expat-devel
%endif
+Requires: rpm
+
%if 0%{?suse_version}
BuildRequires: rpm-devel
Requires: /usr/bin/uuidgen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.10.2/package/libzypp.changes
new/libzypp-9.11.0/package/libzypp.changes
--- old/libzypp-9.10.2/package/libzypp.changes 2011-08-31 14:28:19.000000000
+0200
+++ new/libzypp-9.11.0/package/libzypp.changes 2011-09-13 13:47:48.000000000
+0200
@@ -1,4 +1,51 @@
-------------------------------------------------------------------
+Tue Sep 13 10:51:53 CEST 2011 - m...@suse.de
+
+- Enhance Selectable API
+- version 9.11.0 (8)
+
+-------------------------------------------------------------------
+Sun Sep 11 01:18:59 CEST 2011 - m...@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Sep 11 01:13:12 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 8 01:19:28 CEST 2011 - m...@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 8 01:14:08 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Wed Sep 7 12:38:23 CEST 2011 - m...@suse.de
+
+- Explicitly require rpm.
+- version 9.10.2 (8)
+
+-------------------------------------------------------------------
+Sun Sep 4 01:16:54 CEST 2011 - m...@suse.de
+
+- Update sle-zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Sun Sep 4 01:13:27 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
+Thu Sep 1 01:13:36 CEST 2011 - m...@suse.de
+
+- Update zypp-po.tar.bz2
+
+-------------------------------------------------------------------
Mon Aug 29 10:51:04 CEST 2011 - m...@suse.de
- Extend mount entry comparison fix (bnc#710269)
Files old/libzypp-9.10.2/po/sle-zypp-po.tar.bz2 and
new/libzypp-9.11.0/po/sle-zypp-po.tar.bz2 differ
Files old/libzypp-9.10.2/po/zypp-po.tar.bz2 and
new/libzypp-9.11.0/po/zypp-po.tar.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.10.2/zypp/Digest.cc
new/libzypp-9.11.0/zypp/Digest.cc
--- old/libzypp-9.10.2/zypp/Digest.cc 2011-08-31 14:28:20.000000000 +0200
+++ new/libzypp-9.11.0/zypp/Digest.cc 2011-09-13 13:47:48.000000000 +0200
@@ -14,6 +14,8 @@
#include <cstdio> // snprintf
#include <openssl/evp.h>
+#include <openssl/conf.h>
+#include <openssl/engine.h>
#include <string>
#include <string.h>
@@ -93,6 +95,9 @@
{
if(!openssl_digests_added)
{
+ OPENSSL_config(NULL);
+ ENGINE_load_builtin_engines();
+ ENGINE_register_all_complete();
OpenSSL_add_all_digests();
openssl_digests_added = true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.10.2/zypp/ui/Selectable.cc
new/libzypp-9.11.0/zypp/ui/Selectable.cc
--- old/libzypp-9.10.2/zypp/ui/Selectable.cc 2011-08-31 14:28:20.000000000
+0200
+++ new/libzypp-9.11.0/zypp/ui/Selectable.cc 2011-09-13 13:47:48.000000000
+0200
@@ -88,6 +88,12 @@
bool Selectable::identicalInstalled( const PoolItem & rhs ) const
{ return _pimpl->identicalInstalled( rhs ); }
+ PoolItem Selectable::identicalAvailableObj( const PoolItem & rhs ) const
+ { return _pimpl->identicalAvailableObj( rhs ); }
+
+ PoolItem Selectable::identicalInstalledObj( const PoolItem & rhs ) const
+ { return _pimpl->identicalInstalledObj( rhs ); }
+
PoolItem Selectable::setCandidate( const PoolItem & newCandidate_r,
ResStatus::TransactByValue causer_r )
{ return _pimpl->setCandidate( newCandidate_r, causer_r ); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.10.2/zypp/ui/Selectable.h
new/libzypp-9.11.0/zypp/ui/Selectable.h
--- old/libzypp-9.10.2/zypp/ui/Selectable.h 2011-08-31 14:28:20.000000000
+0200
+++ new/libzypp-9.11.0/zypp/ui/Selectable.h 2011-09-13 13:47:48.000000000
+0200
@@ -174,6 +174,17 @@
bool identicalInstalledUpdateCandidate() const
{ return identicalInstalled( updateCandidateObj() ); }
+ /** Return an available Object with the same content as \c rhs.
+ * Basically the same name, edition, arch, vendor and buildtime.
+ * \see \ref sat::Solvable::identical
+ */
+ PoolItem identicalAvailableObj( const PoolItem & rhs ) const;
+
+ /** \Return an installed Object with the same content as \c rhs.
+ * Basically the same name, edition, arch, vendor and buildtime.
+ * \see \ref sat::Solvable::identical
+ */
+ PoolItem identicalInstalledObj( const PoolItem & rhs ) const;
/** Return the \ref installedObj resolvable casted to a specific kind.
* \code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-9.10.2/zypp/ui/SelectableImpl.h
new/libzypp-9.11.0/zypp/ui/SelectableImpl.h
--- old/libzypp-9.10.2/zypp/ui/SelectableImpl.h 2011-08-31 14:28:20.000000000
+0200
+++ new/libzypp-9.11.0/zypp/ui/SelectableImpl.h 2011-09-13 13:47:48.000000000
+0200
@@ -143,7 +143,10 @@
*/
PoolItem updateCandidateObj() const
{
- if ( multiversionInstall() || installedEmpty() || ! _defaultCandidate )
+ if ( multiversionInstall() )
+ return identicalInstalled( _defaultCandidate ) ? PoolItem() :
_defaultCandidate;
+
+ if ( installedEmpty() || ! _defaultCandidate )
return _defaultCandidate;
// Here: installed and _defaultCandidate are non NULL and it's not a
// multiversion install.
@@ -184,30 +187,38 @@
/** \copydoc Selectable::identicalAvailable( const PoolItem & )const */
bool identicalAvailable( const PoolItem & rhs ) const
+ { return identicalAvailableObj( rhs ); }
+
+ /** \copydoc Selectable::identicalInstalled( const PoolItem & )const */
+ bool identicalInstalled( const PoolItem & rhs ) const
+ { return identicalInstalledObj( rhs ); }
+
+ /** \copydoc Selectable::identicalAvailableObj( const PoolItem & rhs )
const */
+ PoolItem identicalAvailableObj( const PoolItem & rhs ) const
{
if ( !availableEmpty() && rhs )
{
for_( it, _availableItems.begin(), _availableItems.end() )
{
if ( identical( *it, rhs ) )
- return true;
+ return *it;
}
}
- return false;
+ return PoolItem();
}
- /** \copydoc Selectable::identicalInstalled( const PoolItem & )const */
- bool identicalInstalled( const PoolItem & rhs ) const
+ /** \copydoc Selectable::identicalInstalledObj( const PoolItem & rhs )
const */
+ PoolItem identicalInstalledObj( const PoolItem & rhs ) const
{
if ( !installedEmpty() && rhs )
{
for_( it, _installedItems.begin(), _installedItems.end() )
{
if ( identical( *it, rhs ) )
- return true;
+ return *it;
}
}
- return false;
+ return PoolItem();
}
/** Best among all objects. */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
