RPM Packaging: fix build issue on openSUSE 13.1

8 files changed, 42 insertions, 37 deletions

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index cd767bd1e..188d7a6ed 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -201,10 +201,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" \
diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec
index 72ec2f8a6..1cfcc36b8 100644
--- a/redhat/dependencies/arts/arts-3.5.13.2.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.2.spec
@@ -196,18 +196,18 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .pkgconfig
 
 
 %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"
 
-%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" \
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index 80617a600..ac2822ce9 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -93,10 +93,10 @@ Development files for %{name}
 unset QTDIR QTINC QTLIB
 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" \
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
index 58f738326..f89fcf807 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-3.5.13.2.spec
@@ -90,13 +90,14 @@ Development files for %{name}
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt?.sh
 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" \
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index 9353394e6..6be5cc05e 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -102,10 +102,10 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
 %endif
 
-%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" \
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
index 68dac0e31..717d2043d 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-3.5.13.2.spec
@@ -95,17 +95,18 @@ Development files for %{name}
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt?.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt?.sh
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 %if 0%{?rhel} == 4
 export CXXFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE ${CXXFLAGS}"
 %endif
 
-%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" \
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 4624ccbe9..bfa90ad66 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -123,10 +123,10 @@ Development files for %{name}
 %build
 unset QTDIR QTINC QTLIB
 
-%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" \
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
index a153b133b..25e2c0256 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-3.5.13.2.spec
@@ -120,12 +120,15 @@ Development files for %{name}
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 
-%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
+
+pwd
 
 # Note: specifying 'QT_LIBRARY_DIR' allow using QT3 libraries under
 #  another directory than QT3_PREFIX. (E.g. Mageia 2, Mandriva ...)