From 5a37ecbb13adcb886e83bda1ce5dfa033ada07ac Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 5 Jun 2009 13:55:22 +0200 Subject: [PATCH] Adapt to libzypp-6.8.0 api changes. --- package/zypper.changes | 15 ++++++++++----- src/utils/misc.cc | 2 +- zypper.spec.cmake | 8 ++++---- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package/zypper.changes b/package/zypper.changes index e101849..3074f64 100644 --- a/package/zypper.changes +++ b/package/zypper.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Jun 4 16:14:17 CEST 2009 - ma@suse.de + +- Adapt to libzypp-6.8.0 api changes. + +------------------------------------------------------------------- Fri May 22 12:39:03 CEST 2009 - jkupec@suse.cz - Fixed some help issues (bnc #505938) @@ -91,7 +96,7 @@ Tue Feb 24 16:38:16 CET 2009 - ma@suse.de - Let 'zypper clean' keep the raw metadata cache of CD/DVD based repositories. We'd need the CD/DVD again to recreate the data. - If this is actually desired, explicitly remove an recreate the + If this is actually desired, explicitly remove an recreate the CD/DVD based repository. (bnc #476429). ------------------------------------------------------------------- @@ -195,7 +200,7 @@ Mon Nov 24 20:44:40 CET 2008 - jkupec@suse.cz Mon Nov 24 16:21:02 CET 2008 - jkupec@suse.cz - fixed generation of solver testcases for verify and dist-upgrade -- r11789 +- r11789 ------------------------------------------------------------------- Wed Nov 19 15:57:27 CET 2008 - jkupec@suse.cz @@ -476,7 +481,7 @@ Sun Sep 14 00:05:59 CEST 2008 - jkupec@suse.cz - modifyservice --{ar,rr,cl}-to-{enable,disable} options added (fate #304915) -- modifyservice can now modify also non-service repos +- modifyservice can now modify also non-service repos - r11061 ------------------------------------------------------------------- @@ -544,8 +549,8 @@ Mon Sep 8 19:36:42 CEST 2008 - jkupec@suse.cz ------------------------------------------------------------------- Tue Aug 19 16:39:32 CEST 2008 - dmacvicar@suse.de -- confirm unsupported packages in SLE - (fate#305057) +- confirm unsupported packages in SLE + (fate#305057) ------------------------------------------------------------------- Mon Aug 18 17:50:02 CEST 2008 - dmacvicar@suse.de diff --git a/src/utils/misc.cc b/src/utils/misc.cc index 83d0d04..6c44e8a 100644 --- a/src/utils/misc.cc +++ b/src/utils/misc.cc @@ -259,7 +259,7 @@ Pathname cache_rpm(const string & rpm_uri_str, const string & cache_dir) { media::MediaManager mm; media::MediaAccessId mid = mm.open(rpmurl); - mm.attachDesiredMedia(mid); + mm.attach(mid); mm.provideFile(mid, rpmpath.basename()); Pathname localrpmpath = mm.localPath(mid, rpmpath.basename()); diff --git a/zypper.spec.cmake b/zypper.spec.cmake index b491ccb..333390f 100644 --- a/zypper.spec.cmake +++ b/zypper.spec.cmake @@ -11,11 +11,11 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 6.1.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 +BuildRequires: libzypp-devel >= 6.8.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 -Recommends: logrotate cron +Recommends: logrotate cron License: GPL v2 or later Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -27,8 +27,8 @@ Release: 0 Source: @PACKAGE@-@VERSION@.tar.bz2 Prefix: /usr URL: http://en.opensuse.org/Zypper -Provides: y2pmsh -Obsoletes: y2pmsh +Provides: y2pmsh +Obsoletes: y2pmsh %description Command line package management tool using libzypp. -- 2.7.4