13 files changed, 68 insertions, 64 deletions

diff --git a/redhat/Makefile b/redhat/Makefile
index de26a097f..ed2805c48 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -4,7 +4,7 @@ TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.2})
 TDE_GIT_DIR := $(shell cd ../..; pwd)
 TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd)
 RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))"
-DIST := $(shell rpmdist.sh --dist)
+DIST := $(shell ./build/rpmdist.sh --dist)
 
 buildpkg = \
   @echo "Now processing '$(1)' [from $(TDE_PACKAGING_DIR)]."; \
@@ -267,7 +267,7 @@ ifeq (,$(filter $(DIST),.el5))
 	$(call buildpkg,applications/themes/gtk-qt-engine)
 endif
 
-gwenview: tdebase
+gwenview: tdebase libkipi
 	$(call buildpkg,applications/graphics/gwenview)
 
 k3b: tdebase
@@ -295,7 +295,7 @@ kbfx: tdebase
 	$(call buildpkg,applications/system/kbfx)
 
 kbibtex: tdebase
-	$(call buildpkg,applications/office/kbibtex)
+	#$(call buildpkg,applications/office/kbibtex)
 
 kbiff: tdebase
 	$(call buildpkg,applications/internet/kbiff)
@@ -474,7 +474,7 @@ ktorrent: tdebase
 	$(call buildpkg,applications/internet/ktorrent)
 
 kvirc: tdebase
-	$(call buildpkg,applications/internet/kvirc)
+	#$(call buildpkg,applications/internet/kvirc)
 
 kvkbd: tdebase
 	$(call buildpkg,applications/system/kvkbd)
@@ -494,7 +494,7 @@ mplayerthumbs: tdebase
 piklab: tdebase
 	$(call buildpkg,applications/development/piklab)
 
-polkit-agent-tde: tdebase
+polkit-agent-tde: tdebase polkit-tqt
 ifeq (,$(filter $(DIST), .el5 .el6 ))
 	$(call buildpkg,applications/system/polkit-agent-tde)
 endif
diff --git a/redhat/applications/graphics/gwenview/gwenview.spec b/redhat/applications/graphics/gwenview/gwenview.spec
index 0b6b809d0..77b1fc987 100644
--- a/redhat/applications/graphics/gwenview/gwenview.spec
+++ b/redhat/applications/graphics/gwenview/gwenview.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -118,40 +118,46 @@ KIPI image framework.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --docdir=%{tde_tdedocdir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
+  %__mkdir_p build
+  cd build
+fi
+
+# Warning: GCC visibility causes FTBFS [Bug #1285]
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_SKIP_INSTALL_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_NO_BUILTIN_CHRPATH=ON \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DBIN_INSTALL_DIR=%{tde_bindir} \
+  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DWITH_ALL_OPTIONS=ON \
+  -DBUILD_ALL=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 # Removes useless files (-devel ?)
 %__rm -f %{?buildroot}%{tde_libdir}/libgwenviewcore.so
diff --git a/redhat/applications/multimedia/amarok/amarok.spec b/redhat/applications/multimedia/amarok/amarok.spec
index 392177acf..2f5b51151 100644
--- a/redhat/applications/multimedia/amarok/amarok.spec
+++ b/redhat/applications/multimedia/amarok/amarok.spec
@@ -179,7 +179,7 @@ BuildRequires:	%{_lib}ifp-devel
 
 # KARMA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0 && 0%{?mdkver} == 0
+%if 0%{?pclinuxos} == 0 && 0%{?mdkver} < 24090000
 %define with_karma 1
 BuildRequires:	libkarma-devel
 BuildRequires:	karma-sharp
@@ -292,7 +292,7 @@ BuildRequires:	trinity-akode-devel
 
 # MP4V2 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 %define with_mp4v2 1
 BuildRequires:	libmp4v2-devel
 %endif
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index 4f8b19a34..9ec132b50 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -46,7 +46,7 @@
 %global	_normalized_cpu	%(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
 
 # Required for Mageia 2: removes the ldflag '--no-undefined'
-%define _disable_ld_no_undefined 1
+%global _disable_ld_no_undefined 1
 
 
 Name:		trinity-%{tde_pkg}
@@ -210,7 +210,7 @@ BuildRequires:	freetype-devel
 %if 0%{?mdkver} || 0%{?mgaversion}
 BuildRequires:	%{_lib}png-devel
 %endif
-%if 0%{?mdkversion} && 0%{?mdkver} == 0 && 0%{?pclinuxos} == 0
+%if 0%{?mdkversion} && 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
 BuildRequires:	%{_lib}png15-devel
 %endif
 %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@@ -293,7 +293,7 @@ Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 BuildRequires:	%{_lib}wv2-devel
 %endif
 %endif
@@ -303,10 +303,10 @@ BuildRequires:	wv2-devel
 
 # MESA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?mdkver} == 0 && 0%{?pclinuxos} == 0
+%if 0%{?mdkver} < 24090000 && 0%{?pclinuxos} == 0
 BuildRequires:	%{_lib}mesagl-devel
 %endif
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 24090000
 BuildRequires:	%{_lib}glu-devel
 %else
 BuildRequires:	%{_lib}mesaglu1-devel
@@ -1189,6 +1189,12 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
   %{?with_kross:--enable-scripting} %{!?with_kross:--disable-scripting} \
   %{?with_postgresql:--enable-pgsql} %{!?with_postgresql:--disable-pgsql} \
 
+%if %{?with_postgresql}
+# Ensure PQXX was detected
+
+
+%endif
+
 %__make %{?_smp_mflags} || %__make
 
 
@@ -1196,11 +1202,6 @@ CXXFLAGS="${CXXFLAGS} -std=c++11"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot}
 
-#%__mkdir_p "%{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/"
-#for i in {16x16,22x22,32x32,48x48,64x64,128x128}; do
-#  mv "%{buildroot}%{tde_datadir}/icons/crystalsvg/$i/apps/kplato.png %{buildroot}/opt/kde3/share/icons/hicolor/$i/apps/;
-#done
-
 # Fix desktop icon location
 %__mv -f "%{?buildroot}%{tde_datadir}/applnk/"*"/KThesaurus.desktop" "%{?buildroot}%{tde_tdeappdir}"
 
diff --git a/redhat/applications/office/kpilot/kpilot.spec b/redhat/applications/office/kpilot/kpilot.spec
index c470bcb9e..828963b48 100644
--- a/redhat/applications/office/kpilot/kpilot.spec
+++ b/redhat/applications/office/kpilot/kpilot.spec
@@ -155,7 +155,6 @@ fi
   -DCMAKE_SKIP_INSTALL_RPATH=OFF \
   -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
-  -DWITH_GCC_VISIBILITY=OFF \
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
   -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
@@ -181,7 +180,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Unwanted files
 %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
-%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
+%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/ %{?buildroot}%{tde_includedir}/kpilot/ %{?buildroot}%{_includedir}/kpilot/
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
diff --git a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
index c47c7c344..fe9f3ef40 100644
--- a/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
+++ b/redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package polyester (version R14)
+# spec file for package tde-style-polyester (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -135,8 +135,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/plugins/styles/polyester.so
 %{tde_tdelibdir}/tdestyle_polyester_config.la
 %{tde_tdelibdir}/tdestyle_polyester_config.so
-%{tde_tdelibdir}/twin_polyester.la
-%{tde_tdelibdir}/twin_polyester.so
+%{tde_tdelibdir}/twin3_polyester.la
+%{tde_tdelibdir}/twin3_polyester.so
 %{tde_tdelibdir}/twin_polyester_config.la
 %{tde_tdelibdir}/twin_polyester_config.so
 %{tde_datadir}/apps/tdedisplay/color-schemes/PolyesterBlue.kcsrc
diff --git a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
index a5521a976..6c440c0fe 100644
--- a/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
+++ b/redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec
@@ -143,8 +143,8 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %files
 %defattr(-,root,root,-)
-%{tde_tdelibdir}/twin_fahrenheit.la
-%{tde_tdelibdir}/twin_fahrenheit.so
+%{tde_tdelibdir}/twin3_fahrenheit.la
+%{tde_tdelibdir}/twin3_fahrenheit.so
 %{tde_datadir}/apps/twin/fahrenheit.desktop
 %{tde_datadir}/apps/twin/fahrenheit/close.png
 %{tde_datadir}/apps/twin/fahrenheit/help.png
diff --git a/redhat/core/tdeaddons/tdeaddons.spec b/redhat/core/tdeaddons/tdeaddons.spec
index 51c543109..a11c0c654 100644
--- a/redhat/core/tdeaddons/tdeaddons.spec
+++ b/redhat/core/tdeaddons/tdeaddons.spec
@@ -94,7 +94,7 @@ BuildRequires:	SDL-devel
 %endif
 
 # ALSA supportl
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 24090000
 BuildRequires: %{_lib}asound-devel
 %else
 BuildRequires: alsa-lib-devel
diff --git a/redhat/core/tdebase/tdebase.spec b/redhat/core/tdebase/tdebase.spec
index 463576b35..c1dcce65c 100644
--- a/redhat/core/tdebase/tdebase.spec
+++ b/redhat/core/tdebase/tdebase.spec
@@ -576,7 +576,7 @@ BuildRequires:	font-util
 BuildRequires:	bdftopcf
 %endif
 
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 %if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	drakconf
 %endif
@@ -2683,7 +2683,7 @@ ever launching another application.
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
 %endif
@@ -2705,7 +2705,7 @@ ever launching another application.
 %{tde_mandir}/man1/kfmclient.1*
 %{tde_mandir}/man1/konqueror.1*
 
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 
 %post -n trinity-konqueror
 if [ $1 -eq 1 ]; then
@@ -2906,7 +2906,7 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
 
 %postun -n trinity-ksmserver
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 fndSession
 %endif
 %endif
@@ -3493,7 +3493,7 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then
   %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
 fi
 
-%if 0%{?mdkver} == 0
+%if 0%{?mdkver} < 24090000
 # Makes 'media_safelyremove.desktop' an alternative.
 # This allows the use of 'tdeio-umountwrapper' package.
 %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
diff --git a/redhat/core/tdebase/tdm.fc39.te b/redhat/core/tdebase/tdm.fc39.te
index 3278f6ac9..f3bcb40d4 100644
--- a/redhat/core/tdebase/tdm.fc39.te
+++ b/redhat/core/tdebase/tdm.fc39.te
@@ -8,12 +8,13 @@ require {
 	type tmp_t;
 	type unconfined_service_t;
 	type unconfined_t;
+	type var_lib_t;
 	type var_run_t;
 	type xdm_t;
 	class capability2 mac_admin;
 	class dbus send_msg;
-	class fifo_file { getattr open read setattr };
-	class file { getattr lock map open read unlink write };
+	class fifo_file { getattr open read setattr unlink };
+	class file { create entrypoint getattr lock map open read rename unlink write };
 	class lnk_file unlink;
 	class process transition;
 }
@@ -21,8 +22,9 @@ require {
 allow fprintd_t init_t:dbus send_msg;
 allow unconfined_service_t unconfined_t:process transition;
 allow unconfined_t self:capability2 mac_admin;
-allow xdm_t etc_t:file write;
-allow xdm_t tmp_t:fifo_file { getattr open read setattr };
+allow xdm_t etc_t:file { create rename unlink write };
+allow xdm_t tmp_t:fifo_file { getattr open read setattr unlink };
 allow xdm_t tmp_t:file { map open unlink };
 allow xdm_t tmp_t:lnk_file unlink;
+allow xdm_t var_lib_t:file { unlink };
 allow xdm_t var_run_t:file { getattr lock open read write };
diff --git a/redhat/core/tdegraphics/tdegraphics.spec b/redhat/core/tdegraphics/tdegraphics.spec
index a67205930..67a60e45f 100644
--- a/redhat/core/tdegraphics/tdegraphics.spec
+++ b/redhat/core/tdegraphics/tdegraphics.spec
@@ -201,7 +201,7 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 24090000
 BuildRequires: %{_lib}glu-devel
 %else
 BuildRequires: mesaglu-devel
@@ -227,7 +227,7 @@ BuildRequires: libdrm-devel
 %endif
 
 # OPENEXR support
-%if 0%{?mdkver}
+%if 0%{?mdkver} >= 24090000
 BuildRequires:	%{_lib}openexr-devel
 %else
 BuildRequires:	OpenEXR-devel
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
index 6a084abdf..0d9c7b389 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec
@@ -173,7 +173,6 @@ fi
   \
   -DBIN_INSTALL_DIR=%{_bindir} \
   -DINCLUDE_INSTALL_DIR=%{_includedir} \
-  -DLIB_INSTALL_DIR=%{_libdir} \
   ..
 
 %__make %{?_smp_mflags} || %__make
diff --git a/redhat/dependencies/polkit-tqt/polkit-tqt.spec b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
index cd6677eb2..cb3214d20 100644
--- a/redhat/dependencies/polkit-tqt/polkit-tqt.spec
+++ b/redhat/dependencies/polkit-tqt/polkit-tqt.spec
@@ -52,7 +52,6 @@ Source1:		%{name}-rpmlintrc
 
 BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	trinity-dbus-1-tqt-devel
-BuildRequires:	trinity-filesystem >= %{tde_version}
 BuildRequires:	libtqt4-devel
 
 BuildRequires:	desktop-file-utils
@@ -212,8 +211,6 @@ fi
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
-  -DLIB_INSTALL_DIR="%{_libdir}" \
-  \
   -DBUILD_ALL="ON" \
   -DWITH_ALL_OPTIONS="ON" \
   ..