summaryrefslogtreecommitdiffstats
path: root/redhat/tdeaddons
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-07-29 21:51:45 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-07-29 21:51:45 +0200
commit28af76e07607eaaf9d7606c4c4e532a83f793c5b (patch)
tree625ca7519cf74d85da12a7b6963f6d6c9359dca7 /redhat/tdeaddons
parent48f15898ad7c85138e5cf1a50961143389248b7b (diff)
downloadtde-packaging-28af76e07607eaaf9d7606c4c4e532a83f793c5b.tar.gz
tde-packaging-28af76e07607eaaf9d7606c4c4e532a83f793c5b.zip
RPM packaging: update R14 packages
Diffstat (limited to 'redhat/tdeaddons')
-rw-r--r--redhat/tdeaddons/tdeaddons-14.0.0.spec7
1 files changed, 3 insertions, 4 deletions
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}}