summaryrefslogtreecommitdiffstats
path: root/redhat/tdepim/tdepim-14.0.0.spec
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-04-05 14:36:13 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-04-05 14:36:13 +0200
commit693e9a10c0362708a18799f301e8e68752e3b376 (patch)
tree24ed89d67c723ed22bfb6be8344eee5cb353ba6e /redhat/tdepim/tdepim-14.0.0.spec
parent2bccc67f69c937e4db4e12f77182be57dbbb9a6a (diff)
downloadtde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.tar.gz
tde-packaging-693e9a10c0362708a18799f301e8e68752e3b376.zip
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/tdepim/tdepim-14.0.0.spec')
-rw-r--r--redhat/tdepim/tdepim-14.0.0.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index ceeb55886..bdd4c9c65 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -712,6 +712,8 @@ Requires: libcaldav
Requires: libcarddav
Obsoletes: tdepim-tderesources-devel < %{version}-%{release}
+Obsoletes: trinity-tdepim-kresources-devel < %{version}-%{release}
+Provides: trinity-tdepim-kresources-devel = %{version}-%{release}
%description tderesources-devel
%{summary}
@@ -2210,6 +2212,11 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+# Specific path for RHEL4
+if [ -d "/usr/X11R6" ]; then
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+fi
+
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build