RPM: lots of updates for Trinity 14.1.2

Signed-off-by: François Andriot <albator78@libertysurf.fr>

2 files changed, 39 insertions, 32 deletions

diff --git a/redhat/applications/internet/kvirc/kvirc.spec b/redhat/applications/internet/kvirc/kvirc.spec
index a3337d46b..16e07193b 100644
--- a/redhat/applications/internet/kvirc/kvirc.spec
+++ b/redhat/applications/internet/kvirc/kvirc.spec
@@ -172,10 +172,10 @@ export PATH="%{tde_bindir}:${PATH}"
   --with-kde-services-dir=%{tde_datadir}/services \
   --with-kde-library-dir=%{tde_libdir} \
   --with-kde-include-dir=%{tde_tdeincludedir} \
-  --with-qt-name=tqt \
-  --with-qt-library-dir=%{_libdir} \
-  --with-qt-include-dir=%{_includedir}/tqt3 \
-  --with-qt-moc=%{_bindir}/tmoc
+  --with-tqt-name=tqt \
+  --with-tqt-library-dir=%{_libdir} \
+  --with-tqt-include-dir=%{_includedir}/tqt3 \
+  --with-tqt-moc=%{_bindir}/tmoc
 
 # Symbolic links must exist prior to parallel building
 %__make symlinks -C src/kvilib/build
@@ -227,6 +227,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %exclude %{tde_libdir}/kvirc/*/modules/*.so
 %{tde_libdir}/kvirc/
 %{tde_tdeappdir}/kvirc.desktop
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem.upd
+%{tde_datadir}/apps/tdeconf_update/kvirc_soundsystem_upd.sh
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/icons/hicolor/*/*/*.svgz
 %{tde_datadir}/icons/hicolor/*/*/*.xpm
diff --git a/redhat/applications/internet/smb4k/smb4k.spec b/redhat/applications/internet/smb4k/smb4k.spec
index 285b431ec..81ad2fda6 100644
--- a/redhat/applications/internet/smb4k/smb4k.spec
+++ b/redhat/applications/internet/smb4k/smb4k.spec
@@ -58,11 +58,13 @@ Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
@@ -143,41 +145,44 @@ Requires:		%{name} = %{version}-%{release}
 %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/"*"/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} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  --program-prefix="" \
+export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
+
+if ! rpm -E %%cmake|grep -q "cd 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-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+ -DBUILD_ALL="ON" \
+ -DWITH_ALL_OPTIONS="ON" \
+  ..
 
-# SMP safe !
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__rm -fr $RPM_BUILD_ROOT
+%__make install DESTDIR=$RPM_BUILD_ROOT -C build
 
 %find_lang %{tde_pkg}