Hello community,
here is the log from the commit of package libzypp-bindings for
openSUSE:Factory checked in at 2015-07-21 13:27:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libzypp-bindings (Old)
and /work/SRC/openSUSE:Factory/.libzypp-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libzypp-bindings"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libzypp-bindings/libzypp-bindings.changes
2015-05-26 12:33:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libzypp-bindings.new/libzypp-bindings.changes
2015-07-21 13:27:12.000000000 +0200
@@ -10 +10 @@
-- Adapt to libzypp-15.x
+- Adapt to libzypp-15.x (bnc#899755)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp-bindings-0.7.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/libzypp-bindings-0.7.1/package/libzypp-bindings.changes
new/libzypp-bindings-0.7.1/package/libzypp-bindings.changes
--- old/libzypp-bindings-0.7.1/package/libzypp-bindings.changes 2015-05-21
13:20:26.000000000 +0200
+++ new/libzypp-bindings-0.7.1/package/libzypp-bindings.changes 2015-07-10
11:10:43.000000000 +0200
@@ -7,7 +7,7 @@
-------------------------------------------------------------------
Mon May 4 10:17:32 CEST 2015 - m...@suse.de
-- Adapt to libzypp-15.x
+- Adapt to libzypp-15.x (bnc#899755)
- 0.7.0
-------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-bindings-0.7.1/swig/Arch.i
new/libzypp-bindings-0.7.1/swig/Arch.i
--- old/libzypp-bindings-0.7.1/swig/Arch.i 2014-07-01 11:46:31.000000000
+0200
+++ new/libzypp-bindings-0.7.1/swig/Arch.i 2015-07-06 11:51:07.000000000
+0200
@@ -100,6 +100,22 @@
* builtin: armv7hl
*/
static Arch armv7hl() { return zypp::Arch_armv7hl; }
+ /*
+ * builtin: armv7tnhl
+ */
+ static Arch armv7tnhl() { return zypp::Arch_armv7tnhl; }
+ /*
+ * builtin: armv7thl
+ */
+ static Arch armv7thl() { return zypp::Arch_armv7thl; }
+ /*
+ * builtin: armv7nhl
+ */
+ static Arch armv7nhl() { return zypp::Arch_armv7nhl; }
+ /*
+ * builtin: armv7hl
+ */
+ static Arch armv7hl() { return zypp::Arch_armv7hl; }
/*
* builtin: armv7l
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-bindings-0.7.1/swig/CMakeLists.txt
new/libzypp-bindings-0.7.1/swig/CMakeLists.txt
--- old/libzypp-bindings-0.7.1/swig/CMakeLists.txt 2014-12-18
11:21:00.000000000 +0100
+++ new/libzypp-bindings-0.7.1/swig/CMakeLists.txt 2015-07-06
11:51:07.000000000 +0200
@@ -8,25 +8,37 @@
SET( SWIG_INPUT "${CMAKE_CURRENT_SOURCE_DIR}/zypp.i" )
#
+# Allow to build only a subset of language bindings via options
+#
+
+OPTION(BUILD_RUBY_BINDINGS "Build Ruby bindings" ON)
+OPTION(BUILD_PYTHON2_BINDINGS "Build Python 2 bindings" ON)
+OPTION(BUILD_PERL5_BINDINGS "Build Perl 5 bindings" ON)
+
+#
# Let's see which target languages are available
#
-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)
-
-
-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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-bindings-0.7.1/swig/Capabilities.i
new/libzypp-bindings-0.7.1/swig/Capabilities.i
--- old/libzypp-bindings-0.7.1/swig/Capabilities.i 2014-07-01
11:46:31.000000000 +0200
+++ new/libzypp-bindings-0.7.1/swig/Capabilities.i 2015-07-06
11:51:07.000000000 +0200
@@ -8,3 +8,21 @@
#ifdef SWIGPERL5
forwarditer(zypp::Capabilities, zypp::Capability);
#endif
+
+#ifdef SWIGPYTHON
+%include "std_vector.i"
+%include "std_string.i"
+
+%template(StringVector) std::vector<std::string>;
+
+%extend zypp::Capabilities {
+ std::vector<std::string> CapNames()
+ {
+ std::vector<std::string> caps;
+ for (zypp::Capabilities::const_iterator it = self->begin(); it !=
self->end(); ++it) {
+ caps.push_back((*it).asString());
+ }
+ return caps;
+ }
+}
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-bindings-0.7.1/swig/PoolQuery.i
new/libzypp-bindings-0.7.1/swig/PoolQuery.i
--- old/libzypp-bindings-0.7.1/swig/PoolQuery.i 1970-01-01 01:00:00.000000000
+0100
+++ new/libzypp-bindings-0.7.1/swig/PoolQuery.i 2015-07-06 11:51:07.000000000
+0200
@@ -0,0 +1,39 @@
+%ignore zypp::PoolQuery::operator<<;
+%ignore zypp::detail::operator<<;
+%ignore zypp::dumpOn;
+%ignore zypp::detail::dumpOn;
+%ignore operator<<;
+%include <zypp/PoolQuery.h>
+%include "std_vector.i"
+namespace std {
+ %template(PoolItemVector) vector<zypp::PoolItem>;
+}
+namespace zypp
+{
+ namespace detail
+ {
+ %ignore operator<<;
+ }
+}
+%{
+#include <vector>
+using std::vector;
+%}
+
+#ifdef SWIGPYTHON
+%extend zypp::PoolQuery {
+std::vector<zypp::PoolItem> queryResults (zypp::ResPool pool)
+{
+#define for_(IT,BEG,END) for ( decltype(BEG) IT = BEG; IT != END; ++IT )
+ std::vector<zypp::PoolItem> items;
+ for_(it, self->begin(), self->end())
+ {
+ PoolItem pi(*it);
+ items.push_back(pi);
+ }
+
+ return items;
+}
+}
+#endif
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-bindings-0.7.1/swig/ResPool.i
new/libzypp-bindings-0.7.1/swig/ResPool.i
--- old/libzypp-bindings-0.7.1/swig/ResPool.i 2015-02-04 14:01:01.000000000
+0100
+++ new/libzypp-bindings-0.7.1/swig/ResPool.i 2015-07-06 11:51:07.000000000
+0200
@@ -16,6 +16,28 @@
namespace zypp
{
+
+#ifdef SWIGPYTHON
+namespace sat
+{
+%extend Pool {
+ std::string loadSolvFile(std::string _solv, std::string _alias)
+ {
+ RepoInfo tmpRepo;
+ tmpRepo.setAlias(_alias);
+
+ try {
+ addRepoSolv(_solv, tmpRepo);
+ } catch ( const Exception & e ) {
+ return e.msg();
+ }
+
+ return std::string();
+ }
+}
+}
+#endif
+
%extend ResPool {
pool::GetResolvablesToInsDel getTransaction()
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-bindings-0.7.1/swig/SolvAttr.i
new/libzypp-bindings-0.7.1/swig/SolvAttr.i
--- old/libzypp-bindings-0.7.1/swig/SolvAttr.i 1970-01-01 01:00:00.000000000
+0100
+++ new/libzypp-bindings-0.7.1/swig/SolvAttr.i 2015-07-06 11:51:07.000000000
+0200
@@ -0,0 +1,2 @@
+%ignore zypp::sat::SolvAttr::repositoryRevision;
+%include <zypp/sat/SolvAttr.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libzypp-bindings-0.7.1/swig/zypp.i
new/libzypp-bindings-0.7.1/swig/zypp.i
--- old/libzypp-bindings-0.7.1/swig/zypp.i 2015-04-13 15:20:55.000000000
+0200
+++ new/libzypp-bindings-0.7.1/swig/zypp.i 2015-07-06 11:51:07.000000000
+0200
@@ -139,6 +139,8 @@
#include "zypp/Resolver.h"
#include "legacy/GetResolvablesToInsDel.h"
+#include "zypp/sat/SolvAttr.h"
+#include "zypp/PoolQuery.h"
#include "zypp/Product.h"
using namespace boost;
@@ -262,6 +264,8 @@
%include "TmpPath.i"
%include "Resolver.i"
%include "ZConfig.i"
+%include "SolvAttr.i"
+%include "PoolQuery.i"
//just simple files, where we need default ctor
%include <zypp/repo/RepoProvideFile.h>
