X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=poldek.spec;h=54da319a866aeb76b3e096633c7119430ebd4466;hb=refs%2Fheads%2Frpm-4.5;hp=22af5d2c53a17faf0211675e958aec121ac176ae;hpb=af6bf1ff56785ce662b6b23007ab5596acddef70;p=packages%2Fpoldek.git

diff --git a/poldek.spec b/poldek.spec
index 22af5d2..54da319 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -14,7 +14,7 @@
 %define		ver_db_rel	1
 %define		ver_rpm		4.5-49
 
-%define		rel	2
+%define		rel	10
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -35,7 +35,11 @@ Patch0:		%{name}-size-type.patch
 Patch1:		%{name}-config.patch
 Patch2:		pm-hooks.patch
 Patch3:		WTERMSIG.patch
-Patch4:		%{name}-no_local_stdint.patch
+Patch4:		%{name}-multiproto.patch
+Patch5:		%{name}-python-fix.patch
+Patch6:		%{name}-libdb.patch
+Patch7:		openssl.patch
+Patch8:		%{name}-notzdata.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	autoconf
@@ -201,6 +205,10 @@ Moduły języka Python dla poldka.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
@@ -229,7 +237,7 @@ cd ../trurlib
 %{__automake}
 cd ..
 
-CPPFLAGS="%{rpmcppflags} -std=gnu99 -fgnu89-inline"
+CPPFLAGS="%{rpmcppflags} -std=gnu99 -fgnu89-inline -D_GNU_SOURCE=1 -fcommon"
 %configure \
 	%{?with_static:--enable-static --disable-shared} \
 	%{!?with_imode:--disable-imode} \
@@ -239,6 +247,10 @@ CPPFLAGS="%{rpmcppflags} -std=gnu99 -fgnu89-inline"
 %{__make} -j1
 #	--enable-trace
 
+%if %{with python}
+%{__make} -C python
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/cache/%{name}
@@ -251,7 +263,7 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/poldek-config
 %if %{with python}
 %{__make} -C python -j1 install \
 	DESTDIR=$RPM_BUILD_ROOT \
-	libdir=%{py_sitedir}
+	py_sitedir=%{py_sitedir}
 %endif
 
 %{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
@@ -297,7 +309,7 @@ cp -a conf configs
 
 %if %{with python}
 %py_postclean
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_poldekmod.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/_poldekmod.{la,so}
 %endif