Imported Upstream version 0.6.4

Change-Id: Ic39316b3835e32797f15440be9e3a48b68c046d0
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/VERSION.cmake b/VERSION.cmake
index 97560ee..2c07442 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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)