summaryrefslogtreecommitdiffstats
path: root/redhat/tdesdk/tdesdk-14.0.0.spec
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/tdesdk/tdesdk-14.0.0.spec
parentffed930935095fac5a3c79dc4a58ffbc51541482 (diff)
downloadtde-packaging-657041c692742710cdc266301f5f9c8625637867.tar.gz
tde-packaging-657041c692742710cdc266301f5f9c8625637867.zip
RPM Packaging: update R14 main packages
Diffstat (limited to 'redhat/tdesdk/tdesdk-14.0.0.spec')
-rw-r--r--redhat/tdesdk/tdesdk-14.0.0.spec13
1 files changed, 3 insertions, 10 deletions
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index 9ae49a82d..985459107 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -523,7 +523,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdelibdir}/plugins/styles/scheck.so
%{tde_tdelibdir}/plugins/styles/scheck.la
%{tde_datadir}/apps/tdeabc/formats/kdeaccountsplugin.desktop
-%{tde_datadir}/apps/kstyle/themes/scheck.themerc
+%{tde_datadir}/apps/tdestyle/themes/scheck.themerc
%{tde_datadir}/kdepalettes/
%{tde_libdir}/libkstartperf.so.*
@@ -1066,25 +1066,18 @@ Provides: trinity-kdesdk-devel = %{version}-%{release}
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
-
+
%build
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-export LD_LIBRARY_PATH="%{tde_libdir}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt"
-# 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
cd build
%endif
-
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
-DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
@@ -1107,7 +1100,7 @@ cd build
%{!?build_kioslave:-DBUILD_KIOSLAVE=OFF} \
..
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
%install