This commit was manufactured by cvs2git to create tag 'auto-ac-poldek-

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index 5e6d30acf254cb7494ef55817e7b21c95d0171af..3661fb8c572a6cbb03063e6457033eb31c082dc3 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -3,16 +3,15 @@
 %bcond_with    static  # don't use shared libraries
 %bcond_without imode   # don't build interactive mode
 %bcond_with    curl    # link with curl
-%bcond_with    distver # enable distversion patch
 #
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%define        ver_db  4.3.27-1
+%define        ver_db  4.2.50-1
 %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.8
-Release:       4%{?with_distver:+distver}
+Release:       7
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2
@@ -21,14 +20,14 @@ Source1:    %{name}.conf
 Patch0:                %{name}-etc_dir.patch
 Patch1:                %{name}-retr_term.patch
 Patch2:                %{name}-simplestatic.patch
-Patch3:                %{name}-gcc4.patch
-Patch12:       %{name}-distver.patch
+Patch3:                %{name}-cookie.patch
+Patch4:                %{name}-rpmcmd.patch
 URL:           http://team.pld.org.pl/~mis/poldek/
 BuildRequires: automake
 BuildRequires: autoconf
 BuildRequires: bzip2-devel
 %{?with_curl:BuildRequires:    curl-devel >= 7.8}
-BuildRequires: db4.3-devel >= %{ver_db}
+BuildRequires: db-devel >= %{ver_db}
 BuildRequires: gettext-autopoint
 BuildRequires: openssl-devel >= 0.9.7d
 BuildRequires: pcre-devel
@@ -40,7 +39,7 @@ BuildRequires:        perl-tools-pod
 %if %{with static}
 BuildRequires: bzip2-static
 %{?with_curl:BuildRequires:    curl-static}
-BuildRequires: db4.3-static >= %{ver_db}
+BuildRequires: db-static >= %{ver_db}
 BuildRequires: glibc-static
 BuildRequires: libselinux-static
 BuildRequires: ncurses-static
@@ -51,10 +50,9 @@ BuildRequires:       readline-static
 BuildRequires: rpm-static
 BuildRequires: zlib-static
 %endif
-Requires:      db4.3 >= %{ver_db}
+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,7 +91,7 @@ modu
 %patch1 -p1
 %patch2 -p0
 %patch3 -p1
-%{?with_distver:%patch12 -p1}
+%patch4 -p1
 
 %build
 %{__autopoint}