- version 0.18.7, removed -{pkorder,sigsegv,caplookup} patches (applied)

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index f2ce93cfbf61abcae98c4ab3b0b12582ea9e3789..f28d24c201e27d02994b70eb78b7c285bc3dfa39 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -3,28 +3,31 @@
 %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
+%bcond_with    distver # enable distversion patch
 #
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
 %define        ver_db  4.2.50-1
-%define        ver_rpm 4.3-0.20030610.29
+%define        ver_rpm 4.3-0.20040107.34
 Summary:       RPM packages management helper tool
 Summary(pl):   Pomocnicze narzêdzie do zarz±dzania pakietami RPM
 Name:          poldek
-Version:       0.18.3
-Release:       9
+Version:       0.18.7
+Release:       0.1%{?with_distver:+distver}
 License:       GPL v2
 Group:         Applications/System
-Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.gz
-# Source0-md5: 339c54b86bfd733851c0f7125057f446
+Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2
+# Source0-md5: 42830ed55809e41059771b87131a84fd
 Source1:       %{name}.conf
 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
+Patch2:                %{name}-simplestatic.patch
 Patch6:                %{name}-progress2.patch
+Patch7:                %{name}-po.patch
+Patch8:                %{name}-deps-fix.patch
+Patch9:                %{name}-obsoletes_provides.patch
+Patch10:       %{name}-rev-promote.patch
+Patch11:       %{name}-sigsegv2.patch
+Patch12:       %{name}-distver.patch
 URL:           http://team.pld.org.pl/~mis/poldek/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -44,7 +47,7 @@ BuildRequires:        bzip2-static
 %{?with_curl:BuildRequires:    curl-static}
 BuildRequires: db-static >= %{ver_db}
 BuildRequires: glibc-static
-buildRequires: libselinux-static
+BuildRequires: libselinux-static
 BuildRequires: ncurses-static
 BuildRequires: openssl-static
 BuildRequires: pcre-static
@@ -56,6 +59,7 @@ BuildRequires:        zlib-static
 Requires:      db >= %{ver_db}
 Requires:      ed
 Requires:      rpm >= %{ver_rpm}
+%{?with_distver:Requires:      rpm-lib(distver)}
 Requires:      sed
 Requires:      openssl >= 0.9.7c
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -93,13 +97,15 @@ modu
 %patch0 -p1
 %patch1 -p1
 %patch2 -p0
-%{?with_ignarch:%patch3 -p1}
-%patch4 -p1
-%patch5 -p0
 %patch6 -p1
+%patch7 -p1
+%patch8 -p0
+%patch9 -p0
+%patch10 -p0
+%patch11 -p1
+%{?with_distver:%patch12 -p1}
 
 %build
-%{?with_ignarch:rm -f po/pl.gmo}
 %{__autopoint}
 %{__aclocal} -I m4
 %{__autoconf}