Remove references to deprecated UpgradeStatistics.

diff --git a/VERSION.cmake b/VERSION.cmake
index 478e6ac..c054d3d 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -31,7 +31,7 @@
 #
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "2")
-SET(VERSION_PATCH "1")
+SET(VERSION_PATCH "2")
 
 # LAST RELEASED: 1.2.1
 #=======

diff --git a/package/zypper.changes b/package/zypper.changes
index 772e706..3a0614c 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Jul  8 14:20:14 CEST 2009 - ma@suse.de
+
+- Remove references to deprecated UpgradeStatistics.
+- 1.2.2
+
+-------------------------------------------------------------------
 Mon Jun 29 17:40:23 CEST 2009 - jkupec@suse.cz
 
 - Updated translations.

diff --git a/src/solve-commit.cc b/src/solve-commit.cc
index 4969129..5ebabd2 100755 (executable)
--- a/src/solve-commit.cc
+++ b/src/solve-commit.cc
@@ -319,13 +319,13 @@ static bool verify(Zypper & zypper)
   return God->resolver()->verifySystem();
 }
 
-static bool dist_upgrade(Zypper & zypper, zypp::UpgradeStatistics & dup_stats)
+static bool dist_upgrade(Zypper & zypper)
 {
   dump_pool();
   set_solver_flags(zypper);
   zypper.out().info(_("Computing upgrade..."), Out::HIGH);
   DBG << "Calling the solver doUpgrade()..." << endl;
-  return God->resolver()->doUpgrade(dup_stats);
+  return God->resolver()->doUpgrade();
 }
 
 /**
@@ -384,10 +384,8 @@ void solve_and_commit (Zypper & zypper)
           success = verify(zypper);
         else if (zypper.command() == ZypperCommand::DIST_UPGRADE)
         {
-          zypp::UpgradeStatistics dup_stats;
           zypper.out().info(_("Computing distribution upgrade..."));
-          success = dist_upgrade(zypper, dup_stats);
-          //! \todo make use of the upgrade stats
+          success = dist_upgrade(zypper);
         }
         else
         {

diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index 333390f..e6b4a2c 100644 (file)
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           @PACKAGE@
-BuildRequires:  libzypp-devel >= 6.8.0 boost-devel >= 1.33.1 gettext-devel >= 0.15
+BuildRequires:  libzypp-devel >= 6.10.0 boost-devel >= 1.33.1 gettext-devel >= 0.15
 BuildRequires:  readline-devel >= 5.1 augeas-devel >= 0.5.0
 BuildRequires:  gcc-c++ >= 4.1 cmake >= 2.4.6
 Requires:      procps