Bump to libzypp-bindings 0.7.3

[Model] ALL
[BinType] AP
[Customer] OPEN

[Issue#] N/A
[Request] N/A
[Occurrence Version] N/A

[Problem] Version Upgrade
[Cause & Measure] Version Upgrade
[Checking Method] N/A

[Team] Open Source Management and Setting Part
[Developer] dh0128.kwak
[Solution company] Samsung
[Change Type] N/A

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

diff --git a/VERSION.cmake b/VERSION.cmake
index b0f8cf7..195fd4d 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 "2")
+SET(VERSION_MINOR "7")
+SET(VERSION_PATCH "3")

diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes
index 7f19f52..9518e38 100644 (file)
--- a/package/libzypp-bindings.changes
+++ b/package/libzypp-bindings.changes
@@ -1,4 +1,40 @@
 -------------------------------------------------------------------
+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)
+- 0.7.2
+
+-------------------------------------------------------------------
+Thu May 21 13:09:43 CEST 2015 - ma@suse.de
+
+- Fix test to run with ruby-2.2
+- 0.7.1
+
+-------------------------------------------------------------------
+Mon May  4 10:17:32 CEST 2015 - ma@suse.de
+
+- Adapt to libzypp-15.x (bnc#899755)
+- 0.7.0
+
+-------------------------------------------------------------------
+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.
+- 0.6.3
+
+-------------------------------------------------------------------
 Thu Aug 14 14:45:12 CEST 2014 - mls@suse.de
 
 - work around syntax errors because of __attribute__ 

diff --git a/packaging/libzypp-bindings.spec b/packaging/libzypp-bindings.spec
index 305b869..2a35d37 100644 (file)
--- a/packaging/libzypp-bindings.spec
+++ b/packaging/libzypp-bindings.spec
@@ -1,38 +1,48 @@
-# 
+#
 # spec file for package libzypp-bindings
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
-# 
+#
+
+# nodebuginfo
+
 Name:           libzypp-bindings
-Version:        0.6.1
+Version:        0.7.3
 Release:        0
 License:        GPL-2.0+
 Summary:        Bindings for libzypp
 Group:          Development/Sources
-Source:         %{name}-%{version}.tar.gz
-Source1001:    libzypp-bindings.manifest
-
-BuildRequires:  cmake gcc-c++ python-devel
-BuildRequires:  swig
-
-BuildRequires:  libzypp-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  cmake
+BuildRequires:  gcc-c++ >= 4.5
+BuildRequires:  libzypp-devel >= 15.11.0
+BuildRequires:  python-devel < 3
+#BuildRequires:  ruby-devel
+BuildRequires:  swig >= 2
+Source:         %{name}-%{version}.tar.bz2
 
 %description
 This package provides bindings for libzypp, the library for package management.
 
 %prep
 %setup -q
-cp %{SOURCE1001} .
 
 %build
 mkdir build
 cd build
-%cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
-      -DPYTHON_SITEDIR=%{python_sitearch} \
+cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \
+      -DPYTHON_SITEDIR=%{py_sitedir} \
       -DLIB=%{_lib} \
       -DCMAKE_VERBOSE_MAKEFILE=TRUE \
       -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
@@ -40,25 +50,58 @@ cd build
       -DCMAKE_BUILD_TYPE=Release \
       -DCMAKE_SKIP_RPATH=1 \
       ..
+# the swig compile jobs take a lot of memory, so don't use jobs here
 make -j1
 
+%check
+cd build
+make test
+
 %install
 cd build
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
+%{__rm} -rf %{buildroot}
+
+#%package -n ruby-zypp
+#Summary:        Ruby bindings for libzypp
+#Group:          Development/Languages/Ruby
+#
+#%description -n ruby-zypp
+#-
+#
+#%files -n ruby-zypp
+#%defattr(-,root,root,-)
+#%if 0%{?suse_version}
+#%{_libdir}/ruby/vendor_ruby/%{rb_ver}/%{rb_arch}/zypp.so
+#%endif
+#%if 0%{?mandriva_version}
+#%{ruby_sitearchdir}/zypp.so
+#%endif
 
 %package -n python-zypp
 Summary:        Python bindings for libzypp
 Group:          Development/Languages/Python
-Requires:  libzypp
-
 %description -n python-zypp
-Python bindings of libzypp
-
+-
 
 %files -n python-zypp
-%manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{python_sitearch}/_zypp.so
-%{python_sitearch}/zypp.py*
+%{py_sitedir}/_zypp.so
+%{py_sitedir}/zypp.py
+
+%package -n perl-zypp
+Requires:       perl = %{perl_version}
+Summary:        Perl bindings for libzypp
+Group:          Development/Languages/Perl
+
+%description -n perl-zypp
+-
+
+%files -n perl-zypp
+%defattr(-,root,root,-)
+%{perl_vendorlib}/zypp.pm
+%{perl_vendorarch}/zypp.so
+
+%changelog

diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt
index 251b5b5..400c894 100644 (file)
--- a/swig/CMakeLists.txt
+++ b/swig/CMakeLists.txt
@@ -19,19 +19,26 @@ OPTION(BUILD_PERL5_BINDINGS "Build Perl 5 bindings" ON)
 # Let's see which target languages are available
 #
 
-FIND_PACKAGE(Ruby)
-FIND_PACKAGE(PythonLibs)
-FIND_PACKAGE(Perl)
-
-
-IF (RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-  ADD_SUBDIRECTORY(ruby)
-ENDIF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
-    
-IF (PYTHON_LIBRARY)
-  ADD_SUBDIRECTORY(python)
-ENDIF(PYTHON_LIBRARY)
-      
-#IF (PERL_EXECUTABLE)
-#  ADD_SUBDIRECTORY(perl5)
-#ENDIF (PERL_EXECUTABLE)
+IF(BUILD_RUBY_BINDINGS)
+  FIND_PACKAGE(Ruby)
+  IF(RUBY_LIBRARY AND RUBY_INCLUDE_PATH)
+    ADD_SUBDIRECTORY(ruby)
+  ENDIF()
+ENDIF()
+
+IF(BUILD_PYTHON2_BINDINGS)
+  # 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)
+  IF(PYTHON_LIBRARY)
+    ADD_SUBDIRECTORY(python)
+  ENDIF()
+ENDIF()
+
+IF(BUILD_PERL5_BINDINGS)
+  FIND_PACKAGE(Perl)
+  IF(PERL_EXECUTABLE)
+    ADD_SUBDIRECTORY(perl5)
+  ENDIF()
+ENDIF()

diff --git a/swig/RepoManager.i b/swig/RepoManager.i
index a150d32..8f7870d 100644 (file)
--- a/swig/RepoManager.i
+++ b/swig/RepoManager.i
@@ -1,19 +1 @@
 %include <zypp/RepoManager.h>
-
-#ifdef SWIGPYTHON
-%extend  zypp::RepoManager{
-    std::string loadSolvFile(std::string _solv, std::string _alias)
-    {
-        RepoInfo tmpRepo; 
-        tmpRepo.setAlias(_alias);
-        try {
-            sat::Pool::instance().addRepoSolv(_solv, tmpRepo);
-        } catch ( const Exception & e ){
-            return e.msg();
-        }
-
-        return std::string();
-    }
-}
-#endif
-

diff --git a/swig/RepoType.i b/swig/RepoType.i
index 3907371..d9f1164 100644 (file)
--- a/swig/RepoType.i
+++ b/swig/RepoType.i
@@ -1,2 +1 @@
-%ignore zypp::operator<<;
-%include <zypp/repo/RepoType.h>
+%include <zypp/repo/RepoType.h>
\ No newline at end of file

diff --git a/swig/zypp.i b/swig/zypp.i
index bdb2371..eaca647 100644 (file)
--- a/swig/zypp.i
+++ b/swig/zypp.i
@@ -239,7 +239,6 @@ namespace zypp {
 %include "SolvAttr.i"
 %include "Resolvable.i"
 %include "RepoType.i"
-%include "TmpPath.i"
 %include "RepoInfo.i"
 %include "Repository.i"
 %include "ServiceInfo.i"
@@ -263,10 +262,10 @@ namespace zypp {
 %include "ResPool.i"
 %include "ZYppCommitPolicy.i"
 %include "ZYppCommitResult.i"
+%include "TmpPath.i"
 %include "Resolver.i"
 %include "ZConfig.i"
 %include "PoolQuery.i"
-%include "SolvAttr.i"
 
 //just simple files, where we need default ctor
 %include <zypp/repo/RepoProvideFile.h>