- fixed #158

[packages/poldek.git] / poldek.spec

diff --git a/poldek.spec b/poldek.spec
index e4e9ebb3a68f4a8d93950160e65a6525402ac730..e72ed2c25656cd1b9d53cb1c5459dd6179f4abcb 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -5,10 +5,16 @@
 %bcond_without python  # don't build python bindings
 #
 # required versions (forced to avoid SEGV with mixed db used by rpm and poldek)
-%define        ver_db  4.7.25-1
+%if "%{pld_release}" == "ti"
+%define        ver_db  4.5.20
+%define        ver_db_rel      8
+%else
+%define        ver_db  4.7.25
+%define        ver_db_rel      1
+%endif
 %define        ver_rpm 4.4.9-56
 #
-%define                snap    20080519.22
+%define                snap    20080604.13
 %define                rel             2
 Summary:       RPM packages management helper tool
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -18,8 +24,8 @@ Release:      0.%{snap}.%{rel}
 License:       GPL v2
 Group:         Applications/System
 #Source0:      http://poldek.pld-linux.org/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2
-Source0:       %{name}-%{version}-cvs%{snap}.tar.bz2
-# Source0-md5: 41c50bb17f8ac2b50d8838c8a346d0ec
+Source0:       http://carme.pld-linux.org/~megabajt/snaps/poldek/%{name}-%{version}-cvs%{snap}.tar.bz2
+# Source0-md5: 2e1b9bbaf5c39cc626c22978852f6371
 Source1:       %{name}.conf
 Source2:       %{name}-multilib.conf
 Source3:       %{name}-ti.conf
@@ -30,12 +36,13 @@ Source7:    %{name}.png
 Patch0:                %{name}-vserver-packages.patch
 Patch1:                %{name}-config.patch
 Patch2:                %{name}-abort-on-upgrade.patch
+Patch3:     %{name}-158fix.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: bzip2-devel
 BuildRequires: check
-BuildRequires: db-devel >= %{ver_db}
+BuildRequires: db-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires: gettext-autopoint
 BuildRequires: libtool
 BuildRequires: libxml2-devel
@@ -52,7 +59,7 @@ BuildRequires:        xmlto
 BuildRequires: zlib-devel
 %if %{with static}
 BuildRequires: bzip2-static
-BuildRequires: db-static >= %{ver_db}
+BuildRequires: db-static >= %{ver_db}-%{ver_db_rel}
 BuildRequires: glibc-static
 BuildRequires: libselinux-static
 BuildRequires: libxml2-static
@@ -67,8 +74,9 @@ BuildRequires:        zlib-static
 Requires(triggerpostun):       awk
 Requires(triggerpostun):       sed >= 4.0
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      db >= %{ver_db}
+Requires:      db >= %{ver_db}-%{ver_db_rel}
 Requires:      rpm >= %{ver_rpm}
+Requires:      rpm-db-ver = %{ver_db}
 Requires:      rpm-lib = %(rpm -q --qf '%{V}' rpm-lib)
 # vf* scripts use sed
 Requires:      sed
@@ -156,6 +164,7 @@ Moduły języka Python dla poldka.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p0
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f