summaryrefslogtreecommitdiffstats
path: root/redhat/applications
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/applications
parent48f15898ad7c85138e5cf1a50961143389248b7b (diff)
downloadtde-packaging-28af76e07607eaaf9d7606c4c4e532a83f793c5b.tar.gz
tde-packaging-28af76e07607eaaf9d7606c4c4e532a83f793c5b.zip
RPM packaging: update R14 packages
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/bibletime/bibletime-14.0.0.spec6
-rw-r--r--redhat/applications/kpilot/kpilot-14.0.0.spec1
-rw-r--r--redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec2
3 files changed, 3 insertions, 6 deletions
diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec
index 62ef360a5..02b0f8a64 100644
--- a/redhat/applications/bibletime/bibletime-14.0.0.spec
+++ b/redhat/applications/bibletime/bibletime-14.0.0.spec
@@ -53,11 +53,7 @@ BuildRequires: gettext
BuildRequires: clucene-core-devel
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
BuildRequires: %{_lib}clucene-devel
-%else
-BuildRequires: %{_lib}clucene-devel
-%endif
%endif
# Requires: sword
@@ -106,7 +102,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-rpath \
--disable-gcc-hidden-visibility \
\
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
--with-sword-dir=%{tde_prefix}
%endif
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index f7557a3fd..cf3f4dd3e 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -48,6 +48,7 @@ BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: trinity-tdebase-devel >= %{tde_version}
BuildRequires: desktop-file-utils
+BuildRequires: flex-devel
BuildRequires: gettext
BuildRequires: pilot-link-devel >= 0.12
BuildRequires: trinity-tdepim-devel >= %{tde_version}
diff --git a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
index d1e1f428e..5ff803701 100644
--- a/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
+++ b/redhat/applications/tdeio-sword/tdeio-sword-14.0.0.spec
@@ -83,7 +83,7 @@ export PATH="%{tde_bindir}:${PATH}"
--enable-rpath \
--disable-gcc-hidden-visibility \
\
-%if 0%{?fedora} >= 20 || 0%{?pclinuxos}
+%if 0%{?fedora} >= 20 || 0%{?pclinuxos} || 0%{?rhel} >= 7
--with-sword-dir=%{tde_prefix}
%endif