summaryrefslogtreecommitdiffstats
path: root/redhat/tdepim
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:20:16 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2013-09-02 23:20:16 +0200
commit657041c692742710cdc266301f5f9c8625637867 (patch)
tree8dd704518c241faecad00b1ad3535c338b6b5bb4 /redhat/tdepim
parentffed930935095fac5a3c79dc4a58ffbc51541482 (diff)
downloadtde-packaging-657041c692742710cdc266301f5f9c8625637867.tar.gz
tde-packaging-657041c692742710cdc266301f5f9c8625637867.zip
RPM Packaging: update R14 main packages
Diffstat (limited to 'redhat/tdepim')
-rw-r--r--redhat/tdepim/tdepim-14.0.0.spec10
1 files changed, 3 insertions, 7 deletions
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index 5d23b926a..ed7fde7da 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -582,7 +582,9 @@ Group: Environment/Libraries
Requires: libcaldav
Requires: libcarddav
-Obsoletes: tdepim-tderesources < %{version}-%{release}
+Obsoletes: tdepim-kresources < %{version}-%{release}
+Obsoletes: trinity-tdepim-kresources < %{version}-%{release}
+Provides: trinity-tdepim-kresources = %{version}-%{release}
%description tderesources
This package includes several plugins needed to interface with groupware
@@ -2195,12 +2197,6 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export LD_LIBRARY_PATH="%{tde_libdir}"
-
-# Specific path for RHEL4
-if [ -d "/usr/X11R6" ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__mkdir_p build