summaryrefslogtreecommitdiffstats
path: root/redhat/tdesdk
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/tdesdk
parent2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (diff)
downloadtde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.tar.gz
tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.zip
RPM Packaging: fix build issue on openSUSE 13.1
Diffstat (limited to 'redhat/tdesdk')
-rw-r--r--redhat/tdesdk/tdesdk-14.0.0.spec14
-rw-r--r--redhat/tdesdk/tdesdk-3.5.13.2.spec20
2 files changed, 18 insertions, 16 deletions
diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec
index e5d9bd962..fade817ef 100644
--- a/redhat/tdesdk/tdesdk-14.0.0.spec
+++ b/redhat/tdesdk/tdesdk-14.0.0.spec
@@ -1088,10 +1088,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
-%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" \
@@ -1126,9 +1126,9 @@ export PATH="%{tde_bindir}:${PATH}"
# Installs kdepalettes
-%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes
-%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes
-%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes
+%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes/kde_xpaintrc
+%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes/KDE_Gimp
+%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes/README
# Installs SVN protocols as alternatives
%if 0%{?build_kioslave}
diff --git a/redhat/tdesdk/tdesdk-3.5.13.2.spec b/redhat/tdesdk/tdesdk-3.5.13.2.spec
index bd77686b4..92dd7f889 100644
--- a/redhat/tdesdk/tdesdk-3.5.13.2.spec
+++ b/redhat/tdesdk/tdesdk-3.5.13.2.spec
@@ -536,7 +536,7 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_tdelibdir}/plugins/styles/scheck.la
%{tde_datadir}/apps/kabc/formats/kdeaccountsplugin.desktop
%{tde_datadir}/apps/kstyle/themes/scheck.themerc
-%{tde_datadir}/kdepalettes
+%{tde_datadir}/kdepalettes/
%{tde_libdir}/libkstartperf.so.*
%{tde_libdir}/libkstartperf.so
@@ -1091,7 +1091,8 @@ Provides: trinity-kdesdk-devel = %{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"
@@ -1099,10 +1100,11 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
if [ -d /usr/X11R6 ]; then
export RPM_OPT_FLAGS="${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
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+ %__mkdir_p build
+ cd build
+fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
@@ -1136,9 +1138,9 @@ export PATH="%{tde_bindir}:${PATH}"
# Installs kdepalettes
-%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes
-%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes
-%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes
+%__install -D -m 644 kdepalettes/kde_xpaintrc %{?buildroot}%{tde_datadir}/kdepalettes/kde_xpaintrc
+%__install -D -m 644 kdepalettes/KDE_Gimp %{?buildroot}%{tde_datadir}/kdepalettes/KDE_Gimp
+%__install -D -m 644 kdepalettes/README %{?buildroot}%{tde_datadir}/kdepalettes/README
# Installs SVN protocols as alternatives
%if 0%{?build_kioslave}