From 28af76e07607eaaf9d7606c4c4e532a83f793c5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Tue, 29 Jul 2014 21:51:45 +0200 Subject: RPM packaging: update R14 packages --- redhat/tdeaddons/tdeaddons-14.0.0.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'redhat/tdeaddons/tdeaddons-14.0.0.spec') diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 40270cfc7..2ac162ece 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -65,14 +65,14 @@ BuildRequires: db4-devel BuildRequires: db5-devel %endif %endif -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libdb-devel BuildRequires: libdb-cxx-devel %endif %if 0%{?suse_version} BuildRequires: libdb-4_8-devel %endif -%if 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} <= 6 BuildRequires: db4-devel %endif %endif @@ -391,7 +391,7 @@ Requires: %{_lib}jpeg8 %if 0%{?rhel} || 0%{?fedora} Requires: libjpeg %endif -%if 0%{?suse_version} >= 1220 +%if 0%{?suse_version} == 1220 Requires: libjpeg62 %endif %if 0%{?pclinuxos} @@ -670,7 +670,6 @@ done ########## - %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -- cgit v1.2.1