Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2013-03-08 09:22:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2013-03-05 13:07:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new/libzypp.changes 2013-03-08 09:22:20.000000000 +0100 @@ -1,0 +2,13 @@ +Thu Mar 7 14:13:42 CET 2013 - [email protected] + +- Adapt to libsolv dataiterator fixes + (returning random data in some cases) +- Require and adapt to changes in libsolv-0.3.0 +- version 12.10.0 (0) + +------------------------------------------------------------------- +Thu Mar 7 01:13:25 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Old: ---- libzypp-12.9.0.tar.bz2 New: ---- libzypp-12.10.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.WE96mz/_old 2013-03-08 09:22:21.000000000 +0100 +++ /var/tmp/diff_new_pack.WE96mz/_new 2013-03-08 09:22:21.000000000 +0100 @@ -24,7 +24,7 @@ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Package, Patch, Pattern, and Product Management -Version: 12.9.0 +Version: 12.10.0 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -73,7 +73,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.2.1 +BuildRequires: libsolv-devel >= 0.3.0 %if 0%{?suse_version} >= 1100 %requires_eq libsolv-tools %else ++++++ libzypp-12.9.0.tar.bz2 -> libzypp-12.10.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.9.0/VERSION.cmake new/libzypp-12.10.0/VERSION.cmake --- old/libzypp-12.9.0/VERSION.cmake 2013-03-03 01:48:38.000000000 +0100 +++ new/libzypp-12.10.0/VERSION.cmake 2013-03-07 14:35:55.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "12") SET(LIBZYPP_COMPATMINOR "0") -SET(LIBZYPP_MINOR "9") +SET(LIBZYPP_MINOR "10") SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 12.9.0 (0) +# LAST RELEASED: 12.10.0 (0) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.9.0/libzypp.spec.cmake new/libzypp-12.10.0/libzypp.spec.cmake --- old/libzypp-12.9.0/libzypp.spec.cmake 2013-03-03 01:48:38.000000000 +0100 +++ new/libzypp-12.10.0/libzypp.spec.cmake 2013-03-07 14:35:55.000000000 +0100 @@ -73,7 +73,7 @@ BuildRequires: pkg-config %endif -BuildRequires: libsolv-devel >= 0.2.1 +BuildRequires: libsolv-devel >= 0.3.0 %if 0%{?suse_version} >= 1100 %requires_eq libsolv-tools %else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.9.0/package/libzypp.changes new/libzypp-12.10.0/package/libzypp.changes --- old/libzypp-12.9.0/package/libzypp.changes 2013-03-03 01:48:38.000000000 +0100 +++ new/libzypp-12.10.0/package/libzypp.changes 2013-03-07 14:35:55.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Mar 7 14:13:42 CET 2013 - [email protected] + +- Adapt to libsolv dataiterator fixes + (returning random data in some cases) +- Require and adapt to changes in libsolv-0.3.0 +- version 12.10.0 (0) + +------------------------------------------------------------------- +Thu Mar 7 01:13:25 CET 2013 - [email protected] + +- Update zypp-po.tar.bz2 + +------------------------------------------------------------------- Sun Mar 3 01:15:52 CET 2013 - [email protected] - Update zypp-po.tar.bz2 Files old/libzypp-12.9.0/po/zypp-po.tar.bz2 and new/libzypp-12.10.0/po/zypp-po.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.9.0/zypp/sat/LookupAttr.cc new/libzypp-12.10.0/zypp/sat/LookupAttr.cc --- old/libzypp-12.9.0/zypp/sat/LookupAttr.cc 2013-03-03 01:48:38.000000000 +0100 +++ new/libzypp-12.10.0/zypp/sat/LookupAttr.cc 2013-03-07 14:35:55.000000000 +0100 @@ -321,6 +321,7 @@ { _dip = new ::Dataiterator; ::dataiterator_init_clone( _dip, rhs._dip ); + ::dataiterator_strdup( _dip ); } } @@ -599,7 +600,10 @@ break; case REPOKEY_TYPE_DIRSTRARRAY: - return ::repodata_dir2str( _dip->data, _dip->kv.id, _dip->kv.str ); + // may or may not be stringified depending on SEARCH_FILES flag + return( _dip->flags & SEARCH_FILES + ? _dip->kv.str + : ::repodata_dir2str( _dip->data, _dip->kv.id, _dip->kv.str ) ); break; } } @@ -752,10 +756,19 @@ void LookupAttr::iterator::increment() { - if ( _dip && ! ::dataiterator_step( _dip.get() ) ) + if ( _dip ) { - _dip.reset(); - base_reference() = 0; + if ( ! ::dataiterator_step( _dip.get() ) ) + { + _dip.reset(); + base_reference() = 0; + } + else + { + INT << _dip->kv.str << endl; + INT << " " << *this << endl; + ::dataiterator_strdup( _dip.get() ); + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-12.9.0/zypp/solver/detail/SATResolver.cc new/libzypp-12.10.0/zypp/solver/detail/SATResolver.cc --- old/libzypp-12.9.0/zypp/solver/detail/SATResolver.cc 2013-03-03 01:48:38.000000000 +0100 +++ new/libzypp-12.10.0/zypp/solver/detail/SATResolver.cc 2013-03-07 14:35:55.000000000 +0100 @@ -422,7 +422,7 @@ const CapabilitySet & conflict_caps) { _solv = solver_create( _SATPool ); - _solv->vendorCheckCb = &vendorCheck; + ::pool_set_custom_vendorcheck( _SATPool, &vendorCheck ); if (_fixsystem) { queue_push( &(_jobQueue), SOLVER_VERIFY|SOLVER_SOLVABLE_ALL); queue_push( &(_jobQueue), 0 ); @@ -845,7 +845,7 @@ setLocks(); _solv = solver_create( _SATPool ); - _solv->vendorCheckCb = &vendorCheck; + ::pool_set_custom_vendorcheck( _SATPool, &vendorCheck ); if (_fixsystem) { queue_push( &(_jobQueue), SOLVER_VERIFY|SOLVER_SOLVABLE_ALL); queue_push( &(_jobQueue), 0 ); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
