From: Patryk Zawadzki Date: Sun, 1 Jun 2008 20:04:26 +0000 (+0000) Subject: - add rpm-db-ver symbol matching so both poldek and rpm use the same version of db X-Git-Tag: auto/th/poldek-0_30-0_20080604_13_1~2 X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=530c8c411cb5a7b11e8ff0321643fc580cf99617;p=packages%2Fpoldek.git - add rpm-db-ver symbol matching so both poldek and rpm use the same version of db Changed files: poldek.spec -> 1.341 --- diff --git a/poldek.spec b/poldek.spec index ada5771..d54a6aa 100644 --- a/poldek.spec +++ b/poldek.spec @@ -6,9 +6,11 @@ # # required versions (forced to avoid SEGV with mixed db used by rpm and poldek) %if "%{pld_release}" == "ti" -%define ver_db 4.5.20-8 +%define ver_db 4.5.20 +%define ver_db_rel 8 %else -%define ver_db 4.7.25-1 +%define ver_db 4.7.25 +%define ver_db_rel 1 %endif %define ver_rpm 4.4.9-56 # @@ -39,7 +41,7 @@ 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 @@ -56,7 +58,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 @@ -71,8 +73,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