diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | VERSION.cmake | 2 | ||||
| -rw-r--r-- | libzypp-bindings.spec.cmake | 2 | ||||
| -rw-r--r-- | package/libzypp-bindings.changes | 12 | ||||
| -rw-r--r-- | swig/RepoInfo.i | 4 | ||||
| -rw-r--r-- | swig/zypp.i | 3 |
6 files changed, 19 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 485e9c6..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -*~ -build -develplayground diff --git a/VERSION.cmake b/VERSION.cmake index 541e39f..97560ee 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 "6") -SET(VERSION_PATCH "1") +SET(VERSION_PATCH "3") diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index 668dc6e..2460862 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 >= 14.5.0 +BuildRequires: libzypp-devel >= 14.30.0 BuildRequires: python-devel BuildRequires: ruby-devel BuildRequires: swig >= 1.3.40 diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index ca760d9..8028ee2 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,16 @@ ------------------------------------------------------------------- +Fri Oct 17 11:22:13 CEST 2014 - ma@suse.de + +- Adapt to libzypp changes. +- 0.6.3 + +------------------------------------------------------------------- +Thu Aug 14 14:45:12 CEST 2014 - mls@suse.de + +- work around syntax errors because of __attribute__ +- 0.6.2 + +------------------------------------------------------------------- Fri Mar 14 14:39:37 CET 2014 - ma@suse.de - c++11 fixes diff --git a/swig/RepoInfo.i b/swig/RepoInfo.i index 4f6c06c..80b2dd6 100644 --- a/swig/RepoInfo.i +++ b/swig/RepoInfo.i @@ -1,6 +1,6 @@ #ifdef SWIGPERL5 #else -%template(UrlSet) std::set<zypp::Url>; +%template(UrlSet) std::list<zypp::Url>; #endif namespace zypp @@ -31,7 +31,7 @@ namespace zypp typedef std::list<zypp::RepoInfo> RepoInfoList; %template(RepoInfoList) std::list<zypp::RepoInfo>; -%extend zypp::RepoInfo +%extend zypp::RepoInfo { std::string dump(void) const { diff --git a/swig/zypp.i b/swig/zypp.i index 53b781d..a7fb5e1 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -151,6 +151,9 @@ typedef std::list<std::string> StringList; %} +/* swig does not understand the __attribute__ extension */ +#define __attribute__(x) + /* prevent swig from creating a type called 'Target_Type' */ #if defined(SWIGRUBY) #define Target_Type VALUE |