commit libzypp for openSUSE:Factory

27 Oct 2009

Hello community,

here is the log from the commit of package libzypp for openSUSE:Factory
checked in at Tue Oct 27 16:37:00 CET 2009.



--------

--- libzypp/libzypp.changes	2009-10-22 16:40:38.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes	2009-10-27 13:27:18.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Oct 27 12:30:29 CET 2009 - ma@suse.de
+
+- Add Resolver::upgradingRepo demanded by GUI. (bnc #548551)
+- version 6.20.0 (19)
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  libzypp-6.19.3.tar.bz2

New:
----
  libzypp-6.20.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.Zaf0Ox/_old	2009-10-27 16:36:51.000000000 +0100
+++ /var/tmp/diff_new_pack.Zaf0Ox/_new	2009-10-27 16:36:51.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package libzypp (Version 6.19.3)
+# spec file for package libzypp (Version 6.20.0)
 #
 # 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.19.3
+Version:        6.20.0
 Release:        1
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
@@ -84,7 +84,8 @@
 Requires:       libzypp == %{version}
 Requires:       libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel
 Requires:       bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel
-Requires:       cmake libsatsolver-devel >= 0.13.0
+Requires:       cmake
+%requires_ge    libsatsolver-devel
 Summary:        Package, Patch, Pattern, and Product Management - developers files
 Group:          System/Packages
 Provides:       yast2-packagemanager-devel

++++++ libzypp-6.19.3.tar.bz2 -> libzypp-6.20.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.19.3/VERSION.cmake new/libzypp-6.20.0/VERSION.cmake
--- old/libzypp-6.19.3/VERSION.cmake	2009-10-22 15:45:33.000000000 +0200
+++ new/libzypp-6.20.0/VERSION.cmake	2009-10-27 12:49:30.000000000 +0100
@@ -60,9 +60,9 @@
 #
 SET(LIBZYPP_MAJOR "6")
 SET(LIBZYPP_COMPATMINOR "19")
-SET(LIBZYPP_MINOR "19")
-SET(LIBZYPP_PATCH "3")
+SET(LIBZYPP_MINOR "20")
+SET(LIBZYPP_PATCH "0")
 #
-# LAST RELEASED: 6.19.3 (19)
+# LAST RELEASED: 6.20.0 (19)
 # (The number in parenthesis is LIBZYPP_COMPATMINOR)
 #=======
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.19.3/libzypp.spec.cmake new/libzypp-6.20.0/libzypp.spec.cmake
--- old/libzypp-6.19.3/libzypp.spec.cmake	2009-10-22 15:45:33.000000000 +0200
+++ new/libzypp-6.20.0/libzypp.spec.cmake	2009-10-27 12:49:31.000000000 +0100
@@ -82,7 +82,8 @@
 Requires:       libzypp == %{version}
 Requires:       libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel
 Requires:       bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel
-Requires:       cmake libsatsolver-devel >= 0.13.0
+Requires:       cmake
+%requires_ge    libsatsolver-devel
 Summary:        Package, Patch, Pattern, and Product Management - developers files
 Group:          System/Packages
 Provides:       yast2-packagemanager-devel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.19.3/package/libzypp.changes new/libzypp-6.20.0/package/libzypp.changes
--- old/libzypp-6.19.3/package/libzypp.changes	2009-10-22 15:45:33.000000000 +0200
+++ new/libzypp-6.20.0/package/libzypp.changes	2009-10-27 12:49:31.000000000 +0100
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Tue Oct 27 12:30:29 CET 2009 - ma@suse.de
+
+- Add Resolver::upgradingRepo demanded by GUI. (bnc #548551)
+- version 6.20.0 (19)
+
+-------------------------------------------------------------------
 Thu Oct 22 15:09:57 CEST 2009 - ma@suse.de
 
 - Fixes to make libzypp-bindings compile.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.19.3/zypp/Resolver.cc new/libzypp-6.20.0/zypp/Resolver.cc
--- old/libzypp-6.19.3/zypp/Resolver.cc	2009-10-22 15:45:33.000000000 +0200
+++ new/libzypp-6.20.0/zypp/Resolver.cc	2009-10-27 12:49:29.000000000 +0100
@@ -99,6 +99,7 @@
   bool Resolver::solveSrcPackages() const		{ return _pimpl->solveSrcPackages(); }
 
   void Resolver::addUpgradeRepo( Repository repo_r )	{ _pimpl->addUpgradeRepo( repo_r ); }
+  bool Resolver::upgradingRepo( Repository repo_r ) const { return _pimpl->upgradingRepo( repo_r ); }
   void Resolver::removeUpgradeRepo( Repository repo_r )	{ _pimpl->removeUpgradeRepo( repo_r ); }
   void Resolver::removeUpgradeRepos()			{ _pimpl->removeUpgradeRepos(); }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.19.3/zypp/Resolver.h new/libzypp-6.20.0/zypp/Resolver.h
--- old/libzypp-6.19.3/zypp/Resolver.h	2009-10-22 15:45:33.000000000 +0200
+++ new/libzypp-6.20.0/zypp/Resolver.h	2009-10-27 12:49:29.000000000 +0100
@@ -218,15 +218,26 @@
     void setDefaultSolveSrcPackages();
     bool solveSrcPackages() const;
 
+    /** \name Upgrade to content of a specific repository.
+     * \note This is an ordinary solver request. You should simply
+     * \ref resolvePool to execute, and not \ref doUpgrade.
+     */
+    //@{
     /**
      * Adding request to perform a dist upgrade restricted to this repository.
+     *
      * This is what e.g. <tt>zypper dup --repo myrepo</tt> should perform.
      * \see \ref doUpgrade
      */
     void addUpgradeRepo( Repository repo_r );
 
     /**
-     * Remove the upgrade request for this repo.
+     * Whether there is an \c UpgradeRepo request pending for this repo.
+     */
+    bool upgradingRepo( Repository repo_r ) const;
+
+    /**
+     * Remove an upgrade request for this repo.
      */
     void removeUpgradeRepo( Repository repo_r );
 
@@ -234,6 +245,7 @@
      * Remove all upgrade repo requests.
      */
     void removeUpgradeRepos();
+    //@}
 
     /**
      * Adding additional requirement
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.19.3/zypp/media/MediaAccess.h new/libzypp-6.20.0/zypp/media/MediaAccess.h
--- old/libzypp-6.19.3/zypp/media/MediaAccess.h	2009-10-22 15:45:33.000000000 +0200
+++ new/libzypp-6.20.0/zypp/media/MediaAccess.h	2009-10-27 12:49:29.000000000 +0100
@@ -105,7 +105,7 @@
 	 */
 	bool        downloads() const;
 
-	/** \deprecated Use \ref Url::downloads */
+	/** \deprecated Use \ref Url::schemeIsDownloading */
 	static
 	ZYPP_DEPRECATED bool downloads(const Url &url)
         { return url.schemeIsDownloading(); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-6.19.3/zypp/solver/detail/Resolver.h new/libzypp-6.20.0/zypp/solver/detail/Resolver.h
--- old/libzypp-6.19.3/zypp/solver/detail/Resolver.h	2009-10-22 15:45:33.000000000 +0200
+++ new/libzypp-6.20.0/zypp/solver/detail/Resolver.h	2009-10-27 12:49:29.000000000 +0100
@@ -154,7 +154,8 @@
     ResPool pool() const;
     void setPool( const ResPool & pool ) { _pool = pool; }
 
-    void addUpgradeRepo( Repository repo_r ) 		{ if ( repo_r ) _upgradeRepos.insert( repo_r ); }
+    void addUpgradeRepo( Repository repo_r ) 		{ if ( repo_r && ! repo_r.isSystemRepo() ) _upgradeRepos.insert( repo_r ); }
+    bool upgradingRepo( Repository repo_r ) const	{ return( _upgradeRepos.find( repo_r ) != _upgradeRepos.end() ); }
     void removeUpgradeRepo( Repository repo_r )		{ _upgradeRepos.erase( repo_r ); }
     void removeUpgradeRepos()				{ _upgradeRepos.clear(); }
     const std::set<Repository> & upgradeRepos() const	{ return _upgradeRepos; }


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)