From 827ec1aa87225415c3740c55e6ab2391626ebc1d Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 27 May 2013 15:37:23 -0400 Subject: add packaging files --- packaging/libzypp-bindings.changes | 27 +++++++++++++++++ packaging/libzypp-bindings.spec | 61 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 packaging/libzypp-bindings.changes create mode 100644 packaging/libzypp-bindings.spec diff --git a/packaging/libzypp-bindings.changes b/packaging/libzypp-bindings.changes new file mode 100644 index 0000000..9c7e7df --- /dev/null +++ b/packaging/libzypp-bindings.changes @@ -0,0 +1,27 @@ +* Tue Dec 20 2011 Zhang Qiang - 0.5.9.1 +- depend special version of libzypp for opensuse 11.4 and 11.3 + +* Mon Oct 24 2011 Zhang Qiang - 0.5.9 +- Add loadSolvFile API to load solv file + +* Sun Sep 18 2011 Zhang Qiang - 0.5.9 +- Add CapNames to return provides info +- Add a patch to provide PoolQuery interface. + +* Fri Sep 02 2011 Gui Chen - 0.5.9 +- Update to 0.5.9 + +* Mon Aug 01 2011 Gui Chen - 0.5.8 +- Added armv7tnhl and armv7thl support + +* Fri Jan 21 2011 Marko Saukko - 0.5.8 +- Added armv7hl and armv7nhl architectures (BMC#12713) + +* Tue Jan 04 2011 Yi Yang - 0.5.8 +- Support builtin arm architectures + +* Fri Dec 17 2010 Yi Yang - 0.5.8 +- Update to 0.5.8 + +* Thu Nov 25 2010 Yi Yang - 0.5.7 +- Update to 0.5.7 diff --git a/packaging/libzypp-bindings.spec b/packaging/libzypp-bindings.spec new file mode 100644 index 0000000..6ce9957 --- /dev/null +++ b/packaging/libzypp-bindings.spec @@ -0,0 +1,61 @@ +# +# 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. +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# +Name: libzypp-bindings +Version: 0.5.12 +Release: 0 +License: GPL-2.0+ +Summary: Bindings for libzypp +Group: Development/Sources +Source: %{name}-%{version}.tar.gz + +BuildRequires: cmake gcc-c++ python-devel +BuildRequires: swig + +BuildRequires: libzypp-devel + +%description +This package provides bindings for libzypp, the library for package management. + +%prep +%setup -q + +%build +mkdir build +cd build +%cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ + -DPYTHON_SITEDIR=%{python_sitearch} \ + -DLIB=%{_lib} \ + -DCMAKE_VERBOSE_MAKEFILE=TRUE \ + -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=1 \ + .. +make -j1 + +%install +cd build +make install DESTDIR=$RPM_BUILD_ROOT + +%clean + +%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 +%defattr(-,root,root,-) +%{python_sitearch}/_zypp.so +%{python_sitearch}/zypp.py* -- cgit v1.2.3 From 3a970c81bf64d0b40ef03016d4ae129d041ee6a1 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 27 May 2013 16:09:19 -0400 Subject: update to 0.5.14 --- packaging/libzypp-bindings.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/libzypp-bindings.spec b/packaging/libzypp-bindings.spec index 6ce9957..6db3cd9 100644 --- a/packaging/libzypp-bindings.spec +++ b/packaging/libzypp-bindings.spec @@ -8,7 +8,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libzypp-bindings -Version: 0.5.12 +Version: 0.5.14 Release: 0 License: GPL-2.0+ Summary: Bindings for libzypp -- cgit v1.2.3 From 2b3d2e2c00d3a20d38daf13cf736bb4262116c64 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Mon, 27 May 2013 16:27:42 -0400 Subject: Disable perl build --- packaging/libzypp-bindings.changes | 3 +++ swig/CMakeLists.txt | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packaging/libzypp-bindings.changes b/packaging/libzypp-bindings.changes index 9c7e7df..6a03ec5 100644 --- a/packaging/libzypp-bindings.changes +++ b/packaging/libzypp-bindings.changes @@ -1,3 +1,6 @@ +* Mon May 27 2013 Anas Nashif 2fba846 +- Update to 0.5.14 + * Tue Dec 20 2011 Zhang Qiang - 0.5.9.1 - depend special version of libzypp for opensuse 11.4 and 11.3 diff --git a/swig/CMakeLists.txt b/swig/CMakeLists.txt index efa48c4..ea807f6 100644 --- a/swig/CMakeLists.txt +++ b/swig/CMakeLists.txt @@ -24,6 +24,6 @@ IF (PYTHON_LIBRARY) ADD_SUBDIRECTORY(python) ENDIF(PYTHON_LIBRARY) -IF (PERL_EXECUTABLE) - ADD_SUBDIRECTORY(perl5) -ENDIF (PERL_EXECUTABLE) +#IF (PERL_EXECUTABLE) +# ADD_SUBDIRECTORY(perl5) +#ENDIF (PERL_EXECUTABLE) -- cgit v1.2.3 From 70d6563eab9abb0fc3d7c5a616fbbabc031fd912 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Tue, 25 Jun 2013 22:57:26 -0400 Subject: add PoolQuery interface and loadSolvFile PoolQuery exists in zypp but libzypp-bindings, import it loadSolvFile is a help function to extend solv file Signed-off-by: Gui Chen --- swig/PoolQuery.i | 39 +++++++++++++++++++++++++++++++++++++++ swig/RepoManager.i | 18 ++++++++++++++++++ swig/RepoType.i | 3 ++- swig/zypp.i | 5 ++++- 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 swig/PoolQuery.i diff --git a/swig/PoolQuery.i b/swig/PoolQuery.i new file mode 100644 index 0000000..05ff584 --- /dev/null +++ b/swig/PoolQuery.i @@ -0,0 +1,39 @@ +%ignore zypp::PoolQuery::operator<<; +%ignore zypp::detail::operator<<; +%ignore zypp::dumpOn; +%ignore zypp::detail::dumpOn; +%ignore operator<<; +%include +%include "std_vector.i" +namespace std { + %template(PoolItemVector) vector; +} +namespace zypp +{ + namespace detail + { + %ignore operator<<; + } +} +%{ +#include +using std::vector; +%} + +#ifdef SWIGPYTHON +%extend zypp::PoolQuery { +std::vector queryResults (zypp::ResPool pool) +{ +#define for_(IT,BEG,END) for ( decltype(BEG) IT = BEG; IT != END; ++IT ) + std::vector items; + for_(it, self->begin(), self->end()) + { + PoolItem pi(*it); + items.push_back(pi); + } + + return items; +} +} +#endif + diff --git a/swig/RepoManager.i b/swig/RepoManager.i index 8f7870d..a150d32 100644 --- a/swig/RepoManager.i +++ b/swig/RepoManager.i @@ -1 +1,19 @@ %include + +#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 d9f1164..3907371 100644 --- a/swig/RepoType.i +++ b/swig/RepoType.i @@ -1 +1,2 @@ -%include \ No newline at end of file +%ignore zypp::operator<<; +%include diff --git a/swig/zypp.i b/swig/zypp.i index 53b781d..1ed3a7c 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -139,6 +139,8 @@ SWIGINTERNINLINE SV *SWIG_From_double SWIG_PERL_DECL_ARGS_1(double value); #include "zypp/Resolver.h" #include "legacy/GetResolvablesToInsDel.h" +#include "zypp/sat/SolvAttr.h" +#include "zypp/PoolQuery.h" #include "zypp/Product.h" using namespace boost; @@ -233,6 +235,7 @@ namespace zypp { %include "OnMediaLocation.i" %include "Resolvable.i" %include "RepoType.i" +%include "TmpPath.i" %include "RepoInfo.i" %include "Repository.i" %include "ServiceInfo.i" @@ -256,9 +259,9 @@ namespace zypp { %include "ResPool.i" %include "ZYppCommitPolicy.i" %include "ZYppCommitResult.i" -%include "TmpPath.i" %include "Resolver.i" %include "ZConfig.i" +%include "PoolQuery.i" //just simple files, where we need default ctor %include -- cgit v1.2.3 From 4746abc521ff35e5e2d14ff4b41c4020bc6f55d0 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Thu, 27 Jun 2013 02:30:50 -0400 Subject: update changelog Signed-off-by: Gui Chen --- packaging/libzypp-bindings.changes | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/libzypp-bindings.changes b/packaging/libzypp-bindings.changes index 6a03ec5..dcee39f 100644 --- a/packaging/libzypp-bindings.changes +++ b/packaging/libzypp-bindings.changes @@ -1,3 +1,6 @@ +* Thu Jun 27 2013 Gui Chen 18a5e07 +- add more interface for tizen + * Mon May 27 2013 Anas Nashif 2fba846 - Update to 0.5.14 @@ -10,7 +13,7 @@ * Sun Sep 18 2011 Zhang Qiang - 0.5.9 - Add CapNames to return provides info - Add a patch to provide PoolQuery interface. - + * Fri Sep 02 2011 Gui Chen - 0.5.9 - Update to 0.5.9 -- cgit v1.2.3 From 7d35dc6b9c7c91f9cce89ea213115c985d89c314 Mon Sep 17 00:00:00 2001 From: Gui Chen Date: Fri, 28 Jun 2013 03:55:28 -0400 Subject: add class SolvAttr to provide solvable ojbect query --- packaging/libzypp-bindings.changes | 3 +++ swig/SolvAttr.i | 2 ++ swig/zypp.i | 1 + 3 files changed, 6 insertions(+) create mode 100644 swig/SolvAttr.i diff --git a/packaging/libzypp-bindings.changes b/packaging/libzypp-bindings.changes index dcee39f..cc5a9d7 100644 --- a/packaging/libzypp-bindings.changes +++ b/packaging/libzypp-bindings.changes @@ -1,3 +1,6 @@ +* Thu Jun 28 2013 Gui Chen +- add SolvAttr class + * Thu Jun 27 2013 Gui Chen 18a5e07 - add more interface for tizen diff --git a/swig/SolvAttr.i b/swig/SolvAttr.i new file mode 100644 index 0000000..5c77ba8 --- /dev/null +++ b/swig/SolvAttr.i @@ -0,0 +1,2 @@ +%ignore zypp::sat::SolvAttr::repositoryRevision; +%include diff --git a/swig/zypp.i b/swig/zypp.i index 1ed3a7c..b1f2329 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -262,6 +262,7 @@ namespace zypp { %include "Resolver.i" %include "ZConfig.i" %include "PoolQuery.i" +%include "SolvAttr.i" //just simple files, where we need default ctor %include -- cgit v1.2.3 From b765c5bdc1be4790485b13b8281785b0443a0788 Mon Sep 17 00:00:00 2001 From: Alexandru Cornea Date: Sat, 29 Jun 2013 02:03:06 +0300 Subject: resetting manifest requested domain to floor --- packaging/libzypp-bindings.manifest | 5 +++++ packaging/libzypp-bindings.spec | 3 +++ 2 files changed, 8 insertions(+) create mode 100644 packaging/libzypp-bindings.manifest diff --git a/packaging/libzypp-bindings.manifest b/packaging/libzypp-bindings.manifest new file mode 100644 index 0000000..017d22d --- /dev/null +++ b/packaging/libzypp-bindings.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/libzypp-bindings.spec b/packaging/libzypp-bindings.spec index 6db3cd9..68f5f50 100644 --- a/packaging/libzypp-bindings.spec +++ b/packaging/libzypp-bindings.spec @@ -14,6 +14,7 @@ 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 @@ -25,6 +26,7 @@ This package provides bindings for libzypp, the library for package management. %prep %setup -q +cp %{SOURCE1001} . %build mkdir build @@ -56,6 +58,7 @@ Python bindings of libzypp %files -n python-zypp +%manifest %{name}.manifest %defattr(-,root,root,-) %{python_sitearch}/_zypp.so %{python_sitearch}/zypp.py* -- cgit v1.2.3 From d873b13070c863db777506f511435e7d2b45a2b8 Mon Sep 17 00:00:00 2001 From: Chanho Park Date: Mon, 11 Aug 2014 19:40:03 +0900 Subject: packaging: update to 0.6.1 Change-Id: Ia2cb3fc27d5839bc32943af135d55a77942d4743 Signed-off-by: Chanho Park --- packaging/libzypp-bindings.changes | 3 +++ packaging/libzypp-bindings.spec | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/libzypp-bindings.changes b/packaging/libzypp-bindings.changes index cc5a9d7..c376a2f 100644 --- a/packaging/libzypp-bindings.changes +++ b/packaging/libzypp-bindings.changes @@ -1,3 +1,6 @@ +* Mon Aug 11 2014 Chanho Park upstream/0.6.1 +- Update to 0.6.1 + * Thu Jun 28 2013 Gui Chen - add SolvAttr class diff --git a/packaging/libzypp-bindings.spec b/packaging/libzypp-bindings.spec index 68f5f50..305b869 100644 --- a/packaging/libzypp-bindings.spec +++ b/packaging/libzypp-bindings.spec @@ -8,7 +8,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libzypp-bindings -Version: 0.5.14 +Version: 0.6.1 Release: 0 License: GPL-2.0+ Summary: Bindings for libzypp -- cgit v1.2.3 From eb5d93fdaeecd0d87264386291eaf619b5734ea6 Mon Sep 17 00:00:00 2001 From: Michael Schroeder Date: Thu, 14 Aug 2014 14:45:58 +0200 Subject: work around syntax errors because of __attribute__ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ibd8a57caf7f5c398f8a073e0074ce4f5847fed6c Signed-off-by: José Bollo --- VERSION.cmake | 2 +- package/libzypp-bindings.changes | 6 ++++++ swig/zypp.i | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/VERSION.cmake b/VERSION.cmake index 541e39f..b0f8cf7 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 "2") diff --git a/package/libzypp-bindings.changes b/package/libzypp-bindings.changes index ca760d9..7f19f52 100644 --- a/package/libzypp-bindings.changes +++ b/package/libzypp-bindings.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/swig/zypp.i b/swig/zypp.i index b1f2329..9935197 100644 --- a/swig/zypp.i +++ b/swig/zypp.i @@ -153,6 +153,9 @@ typedef std::list 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 -- cgit v1.2.3