- Patches should always be included in SRPM

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index a4e2574bd7e523bf34fbdfecaf7f4186a04caa8c..f2ce93cfbf61abcae98c4ab3b0b12582ea9e3789 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -3,6 +3,7 @@
 %bcond_with    static  # don't use shared libraries
 %bcond_without imode   # don't build interactive mode
 %bcond_with    curl    # link with curl
+%bcond_with    ignarch # add option ignorearch
 #
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
 %define        ver_db  4.2.50-1
@@ -11,16 +12,19 @@ Summary:    RPM packages management helper tool
 Summary(pl):   Pomocnicze narzêdzie do zarz±dzania pakietami RPM
 Name:          poldek
 Version:       0.18.3
-Release:       4
+Release:       9
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.gz
 # Source0-md5: 339c54b86bfd733851c0f7125057f446
 Source1:       %{name}.conf
-Patch1:                %{name}-etc_dir.patch
-Patch2:                %{name}-retr_term.patch
-Patch3:                %{name}-ldb4.patch
-Patch4:                %{name}-be-nice-for-proxy.patch
+Patch0:                %{name}-etc_dir.patch
+Patch1:                %{name}-retr_term.patch
+Patch2:                %{name}-cap_match_req-fix.patch
+Patch3:                %{name}-ignorearch.patch
+Patch4:                %{name}-progress.patch
+Patch5:                %{name}-simplestatic.patch
+Patch6:                %{name}-progress2.patch
 URL:           http://team.pld.org.pl/~mis/poldek/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -28,7 +32,7 @@ BuildRequires:        bzip2-devel
 %{?with_curl:BuildRequires:    curl-devel >= 7.8}
 BuildRequires: db-devel >= %{ver_db}
 BuildRequires: gettext-autopoint
-BuildRequires: openssl-devel >= 0.9.7c
+BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel
 BuildRequires: popt-devel
 BuildRequires: readline-devel
@@ -39,6 +43,8 @@ BuildRequires:        perl-tools-pod
 BuildRequires: bzip2-static
 %{?with_curl:BuildRequires:    curl-static}
 BuildRequires: db-static >= %{ver_db}
+BuildRequires: glibc-static
+buildRequires: libselinux-static
 BuildRequires: ncurses-static
 BuildRequires: openssl-static
 BuildRequires: pcre-static
@@ -46,9 +52,9 @@ BuildRequires:        popt-static
 BuildRequires: readline-static
 BuildRequires: rpm-static
 BuildRequires: zlib-static
-BuildRequires: glibc-static
 %endif
 Requires:      db >= %{ver_db}
+Requires:      ed
 Requires:      rpm >= %{ver_rpm}
 Requires:      sed
 Requires:      openssl >= 0.9.7c
@@ -84,10 +90,16 @@ modu
 
 %prep
 %setup -q
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
+%{?with_ignarch:%patch3 -p1}
+%patch4 -p1
+%patch5 -p0
+%patch6 -p1
 
 %build
+%{?with_ignarch:rm -f po/pl.gmo}
 %{__autopoint}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -114,6 +126,11 @@ sed "s|/i686/|/%{_target_cpu}/|g" < %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/%
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%triggerpostun -- poldek <= 0.18.3-5
+if grep -q '^promoteepoch.*yes' /etc/poldek.conf ; then
+       echo -e ',s:^promoteepoch:# promoteepoch:g\n,w' | ed -s /etc/poldek.conf
+fi
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README* NEWS TODO *sample* conf/poldekrc*