- changed patch number

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index 3ad382e21523899e6af9842b64af4594cd728855..42f1342fa393aef4d45dcea990c273741c09ab0d 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
@@ -10,24 +11,18 @@
 Summary:       RPM packages management helper tool
 Summary(pl):   Pomocnicze narzêdzie do zarz±dzania pakietami RPM
 Name:          poldek
-Version:       0.18.1
-Release:       19
+Version:       0.18.3
+Release:       8
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 8af8090d401254939911e456e2f09e60
+Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.gz
+# Source0-md5: 339c54b86bfd733851c0f7125057f446
 Source1:       %{name}.conf
-Patch0:                %{name}-static.patch
-Patch1:                %{name}-etc_dir.patch
-Patch2:                %{name}-rpm4.2.patch
-Patch3:                %{name}-rpm4.1-fix.patch
-Patch4:                %{name}-retr_term.patch
-Patch5:                %{name}-deps-fix.patch
-Patch6:                %{name}-broken-rpmdb.patch
-Patch7:                %{name}-epoch0.patch
-Patch8:                %{name}-ldb4.patch
-Patch9:                %{name}-unaligned.patch
-Patch10:       %{name}-be-nice-for-proxy.patch
+Patch0:                %{name}-etc_dir.patch
+Patch1:                %{name}-retr_term.patch
+Patch2:                %{name}-cap_match_req-fix.patch
+%{?with_ignarch:Patch3:        %{name}-ignorearch.patch}
+Patch4:                %{name}-progress.patch
 URL:           http://team.pld.org.pl/~mis/poldek/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -35,7 +30,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
@@ -56,6 +51,7 @@ BuildRequires:        zlib-static
 BuildRequires: glibc-static
 %endif
 Requires:      db >= %{ver_db}
+Requires:      ed
 Requires:      rpm >= %{ver_rpm}
 Requires:      sed
 Requires:      openssl >= 0.9.7c
@@ -91,23 +87,19 @@ modu
 
 %prep
 %setup -q
-%patch0        -p1
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p0
+%patch2 -p0
+%{?with_ignarch:%patch3 -p1}
 %patch4 -p1
-%patch5 -p0
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 %build
+%{?with_ignarch:rm -f po/pl.gmo}
 %{__autopoint}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__automake}
+cp -f config.sub trurlib
 %configure \
        %{?with_static:--enable-static} \
        %{!?with_imode:--disable-imode} \
@@ -129,6 +121,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*