X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libsolv.spec;h=21be5c58c47c3a8124dbe7f2a63230a6f4ee0d18;hb=e8a70a90a3bd8334c4cd3d45eaf18db6ba937deb;hp=0bf6d2405b88b1d9e48fb84ef5690b7e8ff4363e;hpb=9dc5988810591994a8c7c904775ed701c34850ad;p=packages%2Flibsolv.git

diff --git a/libsolv.spec b/libsolv.spec
index 0bf6d24..21be5c5 100644
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -9,14 +9,16 @@
 Summary:	Package dependency solver
 Summary(pl.UTF-8):	Biblioteka do rozwiązywania zależności pakietów
 Name:		libsolv
-Version:	0.6.19
-Release:	2
+Version:	0.6.34
+Release:	8
 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:	b1fe10e51190a138767aedf010525032
+# Source0-md5:	b61f8268a60086ae6fbf7a3454d669cb
 Patch0:		ruby.patch
 Patch1:		%{name}-python.patch
+Patch2:		%{name}-rpm5.patch
 URL:		https://github.com/openSUSE/libsolv
 BuildRequires:	bzip2-devel
 BuildRequires:	cmake >= 2.4
@@ -45,6 +47,8 @@ BuildRequires:	swig-ruby
 %endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		specflags	-D_GNU_SOURCE=1
+
 %description
 A free package dependency solver using a satisfiability algorithm. The
 library is based on two major, but independent, blocks:
@@ -173,47 +177,48 @@ Wiązania języka Tcl do bibliotek libsolv.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # use system one
 %{__rm} cmake/modules/FindRuby.cmake
 
 %build
+# TODO: -DENABLE_RPMDB_LIBRPM=ON -DENABLE_RPMPKG_LIBRPM=ON (rpm5 not supported)
+
+%define common_opts \\\
+	-DENABLE_APPDATA=ON \\\
+	-DENABLE_BZIP2_COMPRESSION=ON \\\
+	-DENABLE_COMPLEX_DEPS=ON \\\
+	-DENABLE_HELIXREPO=ON \\\
+	-DENABLE_LZMA_COMPRESSION=ON \\\
+	-DENABLE_PUBKEY=ON \\\
+	-DENABLE_RPMDB=ON \\\
+	-DENABLE_RPMDB_BYRPMHEADER=ON \\\
+	-DENABLE_RPMMD=ON \\\
+	%{?with_static_libs:-DENABLE_STATIC=ON} \\\
+	-DRPM5=ON \\\
+	%{nil}
+
 install -d build %{?with_python3:build-py3}
 cd build
 %cmake .. \
-	-DENABLE_APPDATA=ON \
-	-DENABLE_BZIP2_COMPRESSION=ON \
-	-DENABLE_HELIXREPO=ON \
-	-DENABLE_LZMA_COMPRESSION=ON \
+	%{common_opts} \
 	-DENABLE_PERL=ON \
-	-DENABLE_PUBKEY=ON \
 	-DENABLE_PYTHON=ON \
-	-DENABLE_RPMDB=ON \
-	-DENABLE_RPMDB_BYRPMHEADER=ON \
-	-DENABLE_RPMMD=ON \
 	%{?with_ruby:-DENABLE_RUBY=ON} \
-	%{?with_static_libs:-DENABLE_STATIC=ON} \
 	%{?with_tcl:-DENABLE_TCL=ON} \
 	-DPythonLibs_FIND_VERSION=2 \
 	-DPythonLibs_FIND_VERSION_MAJOR=2 \
-	-DRPM5=ON \
 	-DUSE_VENDORDIRS=ON
 
 %{__make}
 %if %{with python3}
 cd ../build-py3
 %cmake .. \
-	-DENABLE_APPDATA=ON \
-	-DENABLE_BZIP2_COMPRESSION=ON \
-	-DENABLE_LZMA_COMPRESSION=ON \
-	-DENABLE_PUBKEY=ON \
+	%{common_opts} \
 	-DENABLE_PYTHON=ON \
-	-DENABLE_RPMDB=ON \
-	-DENABLE_RPMMD=ON \
-	-DENABLE_RPMDB_BYRPMHEADER=ON \
 	-DPythonLibs_FIND_VERSION=3 \
-	-DPythonLibs_FIND_VERSION_MAJOR=3 \
-	-DRPM5=ON
+	-DPythonLibs_FIND_VERSION_MAJOR=3
 
 %{__make}
 %endif
@@ -251,6 +256,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*