- PLD merge, adjusted for TLD, regenerated python fix patch

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index d59f1a45f5c95166343d1823625767c08684e75d..f372e1b965f962f4bdbbf00fb2000dff80e52276 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -14,7 +14,7 @@
 %define                ver_db_rel      1
 %define                ver_rpm         4.5-49
 
-%define                rel     4
+%define                rel     5
 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,8 +35,9 @@ Patch0:               %{name}-size-type.patch
 Patch1:                %{name}-config.patch
 Patch2:                pm-hooks.patch
 Patch3:                WTERMSIG.patch
-Patch4:                %{name}-no_local_stdint.patch
-Patch5:                %{name}-libdb.patch
+Patch4:                %{name}-multiproto.patch
+Patch5:                %{name}-python-fix.patch
+Patch6:                %{name}-libdb.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires: autoconf
@@ -203,6 +204,7 @@ Moduły języka Python dla poldka.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4
 
@@ -241,6 +243,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}
@@ -253,7 +259,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}
@@ -299,7 +305,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