diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-01-10 16:53:48 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-01-10 16:53:48 +0900 |
commit | bb3882662b5f428d70fa009f938ee62c6319633c (patch) | |
tree | 5f1fcc09ebccf3a1322158ea8fd11f89a058096c | |
parent | 85b1b81f2d4c67148de2ca47d5f77dca1c1b6fa0 (diff) | |
download | libzypp-bindings-bb3882662b5f428d70fa009f938ee62c6319633c.tar.gz libzypp-bindings-bb3882662b5f428d70fa009f938ee62c6319633c.tar.bz2 libzypp-bindings-bb3882662b5f428d70fa009f938ee62c6319633c.zip |
Imported Upstream version 0.7.3upstream/0.7.3upstream
Change-Id: I2c53f0439a0f211cf3b0060a3d324936c6ee38d6
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
-rw-r--r-- | VERSION.cmake | 2 | ||||
-rw-r--r-- | libzypp-bindings.spec.cmake | 2 | ||||
-rw-r--r-- | package/libzypp-bindings.changes | 6 | ||||
-rw-r--r-- | swig/PoolItem.i | 1 | ||||
-rw-r--r-- | swig/ResTraits.i | 1 | ||||
-rw-r--r-- | swig/Resolvable.i | 2 | ||||
-rw-r--r-- | swig/zypp.i | 2 |
7 files changed, 13 insertions, 3 deletions
diff --git a/VERSION.cmake b/VERSION.cmake index 9845770..195fd4d 100644 --- a/VERSION.cmake +++ b/VERSION.cmake @@ -1,4 +1,4 @@ # on maintenance branch add a 2nd level to patch (p.1, p.2, ...) SET(VERSION_MAJOR "0") SET(VERSION_MINOR "7") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index af0774b..0cb1c24 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -26,7 +26,7 @@ Group: Development/Sources BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ >= 4.5 -BuildRequires: libzypp-devel >= 15.10.0 +BuildRequires: libzypp-devel >= 15.11.0 BuildRequires: python-devel < 3 BuildRequires: ruby-devel BuildRequires: swig >= 2 diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 150323e..9518e38 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Aug 10 17:07:09 CEST 2015 - ma@suse.com + +- Adapt to libzypp changes due to FATE#318778 +- 0.7.3 + +------------------------------------------------------------------- Mon Jul 20 13:44:19 CEST 2015 - ma@suse.de - Don't expose resolver internals (due to FATE#318099) diff --git a/swig/PoolItem.i b/swig/PoolItem.i index 34a2eeb..ca4147c 100644 --- a/swig/PoolItem.i +++ b/swig/PoolItem.i @@ -1,3 +1,4 @@ +%template(SolvableType_PoolItem) zypp::sat::SolvableType<zypp::PoolItem>; %include <zypp/PoolItem.h> #ifdef SWIGPERL5 diff --git a/swig/ResTraits.i b/swig/ResTraits.i index 60613ec..cbcefad 100644 --- a/swig/ResTraits.i +++ b/swig/ResTraits.i @@ -90,3 +90,4 @@ namespace zypp %STUFF(SrcPackage) %STUFF(Pattern) %STUFF(Product) +%STUFF(Application) diff --git a/swig/Resolvable.i b/swig/Resolvable.i index 7055b9f..ea4e33a 100644 --- a/swig/Resolvable.i +++ b/swig/Resolvable.i @@ -1,4 +1,6 @@ %ignore zypp::make; %import <zypp/sat/Solvable.h> +%import <zypp/sat/SolvableType.h> +%template(SolvableType_Resolvable) zypp::sat::SolvableType<zypp::Resolvable>; %include <zypp/Resolvable.h> diff --git a/swig/zypp.i b/swig/zypp.i index 37f9a0f..eaca647 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -236,6 +236,7 @@ namespace zypp { %include "Capabilities.i" %include "CapMatch.i" %include "OnMediaLocation.i" +%include "SolvAttr.i" %include "Resolvable.i" %include "RepoType.i" %include "RepoInfo.i" @@ -264,7 +265,6 @@ namespace zypp { %include "TmpPath.i" %include "Resolver.i" %include "ZConfig.i" -%include "SolvAttr.i" %include "PoolQuery.i" //just simple files, where we need default ctor |