summaryrefslogtreecommitdiffstats
path: root/redhat/tdevelop
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2013-11-24 16:48:53 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2013-11-24 16:48:53 +0100
commite9e7fa543273fffa8131b2244e5c994fe22616e2 (patch)
tree6934c069a51e0e17a4a2df4b0521d3f00364a5ac /redhat/tdevelop
parent2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (diff)
downloadtde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.tar.gz
tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.zip
RPM Packaging: fix build issue on openSUSE 13.1
Diffstat (limited to 'redhat/tdevelop')
-rw-r--r--redhat/tdevelop/tdevelop-14.0.0.spec10
-rw-r--r--redhat/tdevelop/tdevelop-3.5.13.2.spec11
2 files changed, 11 insertions, 10 deletions
diff --git a/redhat/tdevelop/tdevelop-14.0.0.spec b/redhat/tdevelop/tdevelop-14.0.0.spec
index 749b11ba2..43a5fd862 100644
--- a/redhat/tdevelop/tdevelop-14.0.0.spec
+++ b/redhat/tdevelop/tdevelop-14.0.0.spec
@@ -577,7 +577,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
- export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+ export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
# c references
@@ -592,10 +592,10 @@ pushd c_cpp_reference-2.0.2_for_KDE_3.0
--with-extra-libs=%{tde_libdir}
popd
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
# Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \
diff --git a/redhat/tdevelop/tdevelop-3.5.13.2.spec b/redhat/tdevelop/tdevelop-3.5.13.2.spec
index d212a5ce4..e2bbc05f3 100644
--- a/redhat/tdevelop/tdevelop-3.5.13.2.spec
+++ b/redhat/tdevelop/tdevelop-3.5.13.2.spec
@@ -585,7 +585,8 @@ Provides: trinity-kdevelop-libs = %{version}-%{release}
%build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
@@ -608,10 +609,10 @@ pushd c_cpp_reference-2.0.2_for_KDE_3.0
--with-extra-libs=%{tde_libdir}
popd
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
-%__mkdir_p build
-cd build
-%endif
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \