summaryrefslogtreecommitdiffstats
path: root/redhat/tdenetwork
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2013-09-02 23:20:16 +0200
committerFrançois Andriot <[email protected]>2013-09-02 23:20:16 +0200
commit657041c692742710cdc266301f5f9c8625637867 (patch)
tree8dd704518c241faecad00b1ad3535c338b6b5bb4 /redhat/tdenetwork
parentffed930935095fac5a3c79dc4a58ffbc51541482 (diff)
downloadtde-packaging-657041c692742710cdc266301f5f9c8625637867.tar.gz
tde-packaging-657041c692742710cdc266301f5f9c8625637867.zip
RPM Packaging: update R14 main packages
Diffstat (limited to 'redhat/tdenetwork')
-rw-r--r--redhat/tdenetwork/tdenetwork-14.0.0.spec15
1 files changed, 9 insertions, 6 deletions
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index d4a02d649..412a2e062 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -85,16 +85,21 @@ BuildRequires: sqlite-devel
BuildRequires: libgadu-devel
%endif
+# XTST support
+%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version}
+BuildRequires: libXtst-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: libxtst-devel
+%endif
+
+# Other stuff
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
BuildRequires: libXmu-devel
BuildRequires: libXScrnSaver-devel
-BuildRequires: libXtst-devel
BuildRequires: libXxf86vm-devel
%endif
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-BuildRequires: libxtst-devel
-%endif
# Wifi support
%if "%{?_with_wifi:1}" == "1"
@@ -1084,8 +1089,6 @@ update-desktop-database 2> /dev/null || :
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-export LD_LIBRARY_PATH="%{tde_libdir}"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then