commit 05212f1aa5dab680b7898e7dd177f2f4b7625240 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sat Jul 1 10:17:03 2017 +0200
- updated to 0.6.28 - removed obsolete perl patch libsolv.spec | 7 +++---- perl.patch | 33 --------------------------------- 2 files changed, 3 insertions(+), 37 deletions(-) --- diff --git a/libsolv.spec b/libsolv.spec index 215731f..7d4adee 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -9,16 +9,15 @@ Summary: Package dependency solver Summary(pl.UTF-8): Biblioteka do rozwiązywania zależności pakietów Name: libsolv -Version: 0.6.27 +Version: 0.6.28 Release: 1 License: BSD Group: Libraries #Source0Download: https://github.com/openSUSE/libsolv/releases Source0: https://github.com/openSUSE/libsolv/archive/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 04803110f87fe3840e611f902f18d8dc +# Source0-md5: 663e6d0b618ab88ce4c1e30b0e2cdfa1 Patch0: ruby.patch Patch1: %{name}-python.patch -Patch2: perl.patch URL: https://github.com/openSUSE/libsolv BuildRequires: bzip2-devel BuildRequires: cmake >= 2.4 @@ -175,7 +174,6 @@ Wiązania języka Tcl do bibliotek libsolv. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 # use system one %{__rm} cmake/modules/FindRuby.cmake @@ -254,6 +252,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_libdir}/libsolvext.so %{_includedir}/solv %{_pkgconfigdir}/libsolv.pc +%{_pkgconfigdir}/libsolvext.pc %{_datadir}/cmake/Modules/FindLibSolv.cmake %{_mandir}/man3/libsolv*.3* diff --git a/perl.patch b/perl.patch deleted file mode 100644 index b3bb29d..0000000 --- a/perl.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 75fa844d8c3658c01b286f5c72d87fce373cfe0b Mon Sep 17 00:00:00 2001 -From: Michael Schroeder <m...@suse.de> -Date: Mon, 19 Jun 2017 11:09:43 +0200 -Subject: [PATCH] Add conditionals for swig perl bug workaround - -It was fixed in swig-2.0.5 and gets in the way with newer perl -versions. ---- - bindings/solv.i | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/bindings/solv.i b/bindings/solv.i -index 043c5491..354cde70 100644 ---- a/bindings/solv.i -+++ b/bindings/solv.i -@@ -330,7 +330,8 @@ typedef struct { - - #if defined(SWIGPERL) - --/* work around a swig bug */ -+/* work around a swig bug for swig versions < 2.0.5 */ -+#if SWIG_VERSION < 0x020005 - %{ - #undef SWIG_CALLXS - #ifdef PERL_OBJECT -@@ -343,6 +344,7 @@ typedef struct { - # endif - #endif - %} -+#endif - - - %define perliter(class) ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libsolv.git/commitdiff/05212f1aa5dab680b7898e7dd177f2f4b7625240 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit