diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-01-10 16:53:11 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2017-01-10 16:53:12 +0900 |
| commit | da4119182e0212f7a0c2b997c109a7b452816c41 (patch) | |
| tree | f3a1e5efc6d802307e92204c7abf7fff20543c2b | |
| parent | 231dfc03df55a4b266195ca9fbe7e4f6899b0375 (diff) | |
| download | libzypp-bindings-da4119182e0212f7a0c2b997c109a7b452816c41.tar.gz libzypp-bindings-da4119182e0212f7a0c2b997c109a7b452816c41.tar.bz2 libzypp-bindings-da4119182e0212f7a0c2b997c109a7b452816c41.zip | |
Imported Upstream version 0.6.4
Change-Id: Ic39316b3835e32797f15440be9e3a48b68c046d0
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/CMakeLists.txt | 3 |
4 files changed, 11 insertions, 2 deletions
diff --git a/VERSION.cmake b/VERSION.cmake index 97560ee..2c07442 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 "3") +SET(VERSION_PATCH "4") diff --git a/libzypp-bindings.spec.cmake b/libzypp-bindings.spec.cmake index 2460862..aa6b73a 100644 --- a/libzypp-bindings.spec.cmake +++ b/libzypp-bindings.spec.cmake @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ >= 4.5 BuildRequires: libzypp-devel >= 14.30.0 -BuildRequires: python-devel +BuildRequires: python-devel < 3 BuildRequires: ruby-devel BuildRequires: swig >= 1.3.40 Source: %{name}-%{version}.tar.bz2 diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index 8028ee2..e451a7f 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 18 11:28:55 CET 2014 - ma@suse.de + +- Enforce Python 2.7 libzypp-bindings is not yet ready for Python 3. +- 0.6.4 + +------------------------------------------------------------------- Fri Oct 17 11:22:13 CEST 2014 - ma@suse.de - Adapt to libzypp changes. diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index efa48c4..7ab74db 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -12,6 +12,9 @@ SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" ) # FIND_PACKAGE(Ruby) +# Enforce Python 2.7, libzypp-bindings does not yet work with Python3 +set(PythonLibs_FIND_VERSION 2.7) +set(PythonLibs_FIND_VERSION_MAJOR 2) FIND_PACKAGE(PythonLibs) FIND_PACKAGE(Perl) |