- merged PLD changes

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index 0660271335c1c2381283705650ed67fca995fec7..ee551c34eeaf2c2ee08daef41752ca9a19a73282 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -1,4 +1,4 @@
-# TODO:
+# TODO
 # - fix config having escaped html entities:
 #   # package A requires capability foo >= 1.0 while package B provides "foo"
 
@@ -19,7 +19,7 @@ Summary(hu.UTF-8):    RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek
 Version:       0.42.2
-Release:       4
+Release:       7
 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
@@ -48,6 +48,9 @@ Patch11:      rpm4-no-dir-deps.patch
 Patch12:       rpm4-rpmvercmp.patch
 Patch13:       trurlib-shared.patch
 Patch14:       rpm4-script-req-workaround.patch
+Patch15:       skip-buildid-obsoletes.patch
+Patch16:       verify-signature.patch
+Patch17:       %{name}-rsa_sig_rpmorg.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: %{db_pkg}-devel >= %{ver_db}
 BuildRequires: autoconf >= 2.63
@@ -60,6 +63,7 @@ BuildRequires:        gettext-tools >= 0.11.5
 BuildRequires: libgomp-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2
+BuildRequires: lua54-devel
 BuildRequires: ncurses-devel
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel
@@ -233,6 +237,9 @@ cd trurlib
 %patch13 -p1
 cd ..
 %patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %{__rm} doc/poldek.info
 %{__rm} m4/libtool.m4 m4/lt*.m4
@@ -297,7 +304,7 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/poldek-config
 
 %{?with_static:%{__rm} $RPM_BUILD_ROOT%{_bindir}/rpmvercmp}
 
-%ifarch i686 aarch64
+%ifarch i686 aarch64 %{arm}
        %define         ftp_arch        %{_target_cpu}
 %endif
 %ifarch %{x8664}
@@ -308,7 +315,7 @@ install -p %{SOURCE4} $RPM_BUILD_ROOT%{_bindir}/poldek-config
 %define        tld_conf %{SOURCE1}
 
 %ifarch %{x8664}
-       %define tld_multilib_conf %{SOURCE2}
+       %define         tld_multilib_conf       %{SOURCE2}
 %endif
 
 %define        tld_debuginfo_conf %{SOURCE3}