RPM Packaging: fix build issue on openSUSE 13.1

31 files changed, 216 insertions, 158 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 ...)
diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec
index e52919c50..6d372f060 100644
--- a/redhat/tdeaddons/tdeaddons-14.0.0.spec
+++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec
@@ -670,10 +670,10 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 
-%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
 
 if [ -d "/usr/include/db53" ]; then
   export CMAKE_INCLUDE_PATH="/usr/include/db53"
diff --git a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
index 5ccf7a2a1..b45ca3e93 100644
--- a/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
+++ b/redhat/tdeaddons/tdeaddons-3.5.13.2.spec
@@ -686,7 +686,8 @@ done
 
 
 %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:${PKG_CONFIG_PATH}"
 
diff --git a/redhat/tdeartwork/tdeartwork-14.0.0.spec b/redhat/tdeartwork/tdeartwork-14.0.0.spec
index 42e1205ce..b4f12a952 100644
--- a/redhat/tdeartwork/tdeartwork-14.0.0.spec
+++ b/redhat/tdeartwork/tdeartwork-14.0.0.spec
@@ -674,10 +674,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/tdeartwork/tdeartwork-3.5.13.2.spec b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
index 7646dfc70..cc8745c2a 100644
--- a/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
+++ b/redhat/tdeartwork/tdeartwork-3.5.13.2.spec
@@ -672,7 +672,8 @@ cd kscreensaver/kxsconfig/
 
 
 %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"
 
@@ -681,10 +682,10 @@ 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" \
diff --git a/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch b/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
new file mode 100644
index 000000000..c02c3e6c6
--- /dev/null
+++ b/redhat/tdebase/tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch
@@ -0,0 +1,25 @@
+--- tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp.new	2013-11-11 21:27:09.960234089 +0100
++++ tdebase/tdeioslave/media/mediamanager/tdehardwarebackend.cpp	2013-11-11 21:32:16.081679386 +0100
+@@ -979,9 +979,21 @@
+ 	}
+ 
+ 	if (valids.contains("utf8")) {
+-		value = config.readBoolEntry("utf8", true);
++		// From "man mount": only some filesystems support 'iocharset' option.
++		if( (sdevice->fileSystemName() == "fat")
++		 || (sdevice->fileSystemName() == "iso9660")
++		 || (sdevice->fileSystemName() == "jfs")
++		 || (sdevice->fileSystemName() == "msdos")
++		 || (sdevice->fileSystemName() == "ntfs")
++		 || (sdevice->fileSystemName() == "umsdos")
++		 || (sdevice->fileSystemName() == "vfat")
++		) {
++			value = false; //config.readBoolEntry("utf8", true);
++		} else {
++			value = false;
++       }
+ 		tmp = TQString("utf8=%1").arg(value ? "true" : "false");
+ 		result << tmp;
+ 	}
+ 
+ 	if (valids.contains("shortname")) {
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 2a995a7b8..661c5d6e2 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -322,6 +322,9 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	glib2-devel
 BuildRequires:	pcre-devel
 
+# SASL support
+BuildRequires:	cyrus-sasl-devel
+
 # LIBUSB support
 BuildRequires:	pam-devel
 %if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
@@ -3337,10 +3340,10 @@ if [ -d "/usr/include/samba-4.0" ]; then
   export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
 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" \
diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec
index 90071914c..b8f3cc267 100644
--- a/redhat/tdebase/tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/tdebase-3.5.13.2.spec
@@ -192,7 +192,6 @@ Requires:	fedora-release-notes
 %define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html
 %endif
 
-
 # RHEL 4 Theme
 %if 0%{?rhel} == 4
 Requires:	desktop-backgrounds-basic
@@ -349,6 +348,9 @@ BuildRequires:	libvorbis-devel
 BuildRequires:	glib2-devel
 BuildRequires:	pcre-devel
 
+# SASL support
+BuildRequires:	cyrus-sasl-devel
+
 # LIBUSB support
 BuildRequires:	pam-devel
 %if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
@@ -424,6 +426,7 @@ BuildRequires:	gnome-screensaver
 BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
+BuildRequires:	xscreensaver
 BuildRequires:	libXScrnSaver-devel
 %endif
 %if 0%{?suse_version} == 1140
@@ -498,18 +501,24 @@ BuildRequires:	libsmbclient-devel
 BuildRequires:	imake
 %endif
 
+# XKB support
+%if 0%{?suse_version} == 1140
+BuildRequires:	xorg-x11-libxkbfile-devel
+%endif
+%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
+BuildRequires:	libxkbfile-devel
+%endif
+
 # X11 stuff ...
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
 %endif
 
 %if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libxkbfile-devel
 BuildRequires:	xorg-x11-libfontenc-devel
 %endif
 
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
-BuildRequires:	libxkbfile-devel
 BuildRequires:	libfontenc-devel
 %endif
 
@@ -586,9 +595,6 @@ Requires:	openssl
 
 # RHEL 6 Configuration files are provided in separate packages
 %if 0%{?rhel} || 0%{?fedora}
-%if "%{?tde_prefix}" == "/usr"
-Requires:	kde-settings-kdm
-%endif
 Requires:	redhat-menus
 %endif
 
@@ -3368,7 +3374,8 @@ Windows and Samba shares.
 
 
 %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:${PKG_CONFIG_PATH}"
 
@@ -3386,10 +3393,10 @@ if [ -d "/usr/include/samba-4.0" ]; then
   export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/include/samba-4.0"
 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" \
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index d72420c0b..0f07bb31e 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -88,12 +88,16 @@ BuildRequires:	libpaper-devel
 %endif
 
 # T1LIB support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} <= 1230
+%define with_t1lib 1
+BuildRequires:	t1lib-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora}
 %define with_t1lib 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}t1lib-devel
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	t1lib-devel
 %endif
 %endif
@@ -174,7 +178,7 @@ BuildRequires:	%{_lib}poppler-devel
 %endif
 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
 # On RHEL 5, the distro-provided poppler is too old. We built a newer one.
-BuildRequires:	trinity-poppler-devel
+BuildRequires:	trinity-poppler-devel >= 0.12
 BuildRequires:	trinity-poppler-qt3-devel >= 0.12
 %endif
 
@@ -1267,10 +1271,10 @@ 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
+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/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
index a27951ea6..9fc24e792 100644
--- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
+++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec
@@ -88,12 +88,16 @@ BuildRequires:	libpaper-devel
 %endif
 
 # T1LIB support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} <= 1230
+%define with_t1lib 1
+BuildRequires:	t1lib-devel
+%endif
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora}
 %define with_t1lib 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}t1lib-devel
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	t1lib-devel
 %endif
 %endif
@@ -1270,10 +1274,10 @@ 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
 
 # Note: the "-L%{tde_libdir}" is required for RHEL5, where poppler is under /opt/trinity.
 %cmake \
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index edf0782bf..b53fcdd69 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -260,12 +260,16 @@ BuildRequires:	NetworkManager-devel
 %endif
 
 # Certificates support
-%if 0%{?rhel} || 0%{?fedora}
-%define	cacert %{_sysconfdir}/ssl/certs/ca-certificates.crt
+%if 0%{?rhel} >= 6 || 0%{?fedora}
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 Requires:		ca-certificates
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define	cacert %{_sysconfdir}/ssl/certs/ca-bundle.crt
+%define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
+Requires:		openssl
+%endif
+%if 0%{?rhel} == 5
+%define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 Requires:		openssl
 %endif
 
@@ -447,10 +451,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/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index a2a9a3a79..016acd3e3 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -396,11 +396,10 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -L/usr/X11R6/%{_lib} -I/usr/X11R6/include"
 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" \
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index ada8480f6..d1d20c7bd 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -80,7 +80,7 @@ BuildRequires:	sqlite-devel
 
 # GADU support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_gadu 1tdenetwork-14.0.0-fix_kget.patch
+%define with_gadu 1
 BuildRequires:	libgadu-devel
 %endif
 
@@ -1090,13 +1090,13 @@ 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
 
-%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/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
index 4b5b65217..3f88a7e93 100644
--- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -1086,7 +1086,8 @@ update-desktop-database 2> /dev/null || :
 %endif
 
 %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"
 
@@ -1095,10 +1096,10 @@ 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" \
diff --git a/redhat/tdepim/tdepim-14.0.0.spec b/redhat/tdepim/tdepim-14.0.0.spec
index df37e0c89..2be7c765e 100644
--- a/redhat/tdepim/tdepim-14.0.0.spec
+++ b/redhat/tdepim/tdepim-14.0.0.spec
@@ -2198,10 +2198,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
 
 # Warning: GCC visibility causes FTBFS [Bug #1285]
 %cmake \
diff --git a/redhat/tdepim/tdepim-3.5.13.2.spec b/redhat/tdepim/tdepim-3.5.13.2.spec
index 3c31f67ba..7d83cd64f 100644
--- a/redhat/tdepim/tdepim-3.5.13.2.spec
+++ b/redhat/tdepim/tdepim-3.5.13.2.spec
@@ -2197,7 +2197,8 @@ fi
 
 
 %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"
 
@@ -2206,10 +2207,10 @@ 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" \
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}
diff --git a/redhat/tdetoys/tdetoys-14.0.0.spec b/redhat/tdetoys/tdetoys-14.0.0.spec
index 0144e23ce..e464773a5 100644
--- a/redhat/tdetoys/tdetoys-14.0.0.spec
+++ b/redhat/tdetoys/tdetoys-14.0.0.spec
@@ -384,12 +384,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
-%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/tdetoys/tdetoys-3.5.13.2.spec b/redhat/tdetoys/tdetoys-3.5.13.2.spec
index 82895e0e0..aa31d8b07 100644
--- a/redhat/tdetoys/tdetoys-3.5.13.2.spec
+++ b/redhat/tdetoys/tdetoys-3.5.13.2.spec
@@ -382,7 +382,8 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 
 %build
-unset QTDIR || : ; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 export KDEDIR=%{tde_prefix}
 
@@ -391,10 +392,10 @@ 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" \
diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec
index d436ae9d2..fc510bd38 100644
--- a/redhat/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/tdeutils/tdeutils-14.0.0.spec
@@ -987,14 +987,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 # Shitty hack for RHEL4 ...
 if [ -d "/usr/X11R6" ]; then
   export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
-  export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-  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
 
-%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/tdeutils/tdeutils-3.5.13.2.spec b/redhat/tdeutils/tdeutils-3.5.13.2.spec
index 4350fc161..b8ed9aa9f 100644
--- a/redhat/tdeutils/tdeutils-3.5.13.2.spec
+++ b/redhat/tdeutils/tdeutils-3.5.13.2.spec
@@ -971,7 +971,8 @@ Development files for %{name}.
 
 
 %build
-unset QTDIR || : ; source /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"
 
@@ -984,10 +985,10 @@ 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" \
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" \