RPM: update spec files for R14.0.10

Signed-off-by: François Andriot <[email protected]>

6 files changed, 75 insertions, 56 deletions

diff --git a/redhat/applications/kaffeine/kaffeine.spec b/redhat/applications/kaffeine/kaffeine.spec
index 2ff080f22..971121e94 100644
--- a/redhat/applications/kaffeine/kaffeine.spec
+++ b/redhat/applications/kaffeine/kaffeine.spec
@@ -64,7 +64,7 @@ BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
@@ -215,6 +215,7 @@ Konqueror plugin, OSD and much more.
 %{tde_datadir}/mimelnk/*/*.desktop
 %{tde_datadir}/service*/*.desktop
 %{tde_tdedocdir}/HTML/en/kaffeine/
+%{tde_mandir}/man1/kaffeine.1*
 
 ##########
 
@@ -260,39 +261,34 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/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} \
-  --libdir=%{tde_libdir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --mandir=%{tde_mandir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
+  -DLIB_INSTALL_DIR=%{tde_libdir} \
+  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
   \
-  --with-xinerama \
-  --with-gstreamer \
-  --with-lame \
-%if 0%{?rhel} > 0 && 0%{?rhel} <= 5
-  --without-dvb \
-%endif
-  
+  -DWITH_ALL_OPTIONS=ON \
+  %{?!with_lame:-DWITH_LAME=OFF} \
+  -DBUILD_ALL=ON \
+  ..
 
 %__make %{?_smp_mflags}
 
@@ -300,7 +296,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf $RPM_BUILD_ROOT
-%__make install DESTDIR=$RPM_BUILD_ROOT
+%__make install DESTDIR=%{buildroot} -C build
 
 ## File lists
 # locale's
diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec
index 2dd05dd51..b7d0b5e80 100644
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ b/redhat/applications/kmplayer/kmplayer.spec
@@ -62,7 +62,7 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
@@ -139,6 +139,16 @@ BuildRequires:	dbus-1-glib-devel
 BuildRequires:	dbus-glib-devel
 %endif
 
+# NSPR support
+%if 0%{?suse_version}
+BuildRequires:	mozilla-nspr-devel
+%else
+BuildRequires:	nspr-devel
+%endif
+
+# Koffice support
+BuildRequires:	trinity-koffice-devel
+
 Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
@@ -164,11 +174,17 @@ KMPlayer can:
 %{tde_bindir}/kmplayer
 %{tde_bindir}/knpplayer
 %{tde_bindir}/kxvplayer
+%{tde_datadir}/services/kmplayer_koffice.desktop
+%{tde_libdir}/libkmplayercommon.so.1
+%{tde_libdir}/libkmplayercommon.so.1.0.0
 %{tde_libdir}/libtdeinit_kmplayer.la
 %{tde_libdir}/libtdeinit_kmplayer.so
 %{tde_tdelibdir}/kmplayer.la
 %{tde_tdelibdir}/kmplayer.so
+%{tde_tdelibdir}/libkmplayerkofficepart.la
+%{tde_tdelibdir}/libkmplayerkofficepart.so
 %{tde_tdeappdir}/kmplayer.desktop
+
 %exclude %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %exclude %{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
 %exclude %{tde_datadir}/apps/kmplayer/noise.gif
@@ -190,13 +206,15 @@ Core files needed for KMPlayer.
 %{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
-%config(noreplace) %{tde_confdir}/kmplayerrc
+%dir %{tde_datadir}/config
+%config(noreplace) %{tde_datadir}/config/kmplayerrc
 %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %{tde_datadir}/apps/kmplayer/noise.gif
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.svgz
 %{tde_datadir}/mimelnk/application/x-kmplayer.desktop
 %{tde_datadir}/mimelnk/video/x-ms-wmp.desktop
+%{tde_mandir}/man1/kmplayer.1*
 
 ##########
 
@@ -245,33 +263,34 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
-export kde_confdir="%{tde_confdir}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS}" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
+  -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
 
@@ -279,7 +298,7 @@ export kde_confdir="%{tde_confdir}"
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}
 
diff --git a/redhat/applications/konversation/konversation.spec b/redhat/applications/konversation/konversation.spec
index 180359db0..57d46674a 100644
--- a/redhat/applications/konversation/konversation.spec
+++ b/redhat/applications/konversation/konversation.spec
@@ -109,7 +109,8 @@ BuildRequires:	libXi6-devel
 #  RHEL 5: available in centos-extras
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/applications/kpowersave/kpowersave.spec b/redhat/applications/kpowersave/kpowersave.spec
index 80d30c495..3046fedf4 100644
--- a/redhat/applications/kpowersave/kpowersave.spec
+++ b/redhat/applications/kpowersave/kpowersave.spec
@@ -82,7 +82,8 @@ BuildRequires:	brp-check-trinity
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/applications/tde-guidance/tde-guidance.spec b/redhat/applications/tde-guidance/tde-guidance.spec
index 98c5cbe9d..a97fe18ee 100644
--- a/redhat/applications/tde-guidance/tde-guidance.spec
+++ b/redhat/applications/tde-guidance/tde-guidance.spec
@@ -104,7 +104,8 @@ BuildRequires:	libXxf86vm-devel
 #  RHEL 4: disabled
 #  RHEL 6: available in EPEL
 #  RHEL 7: available in NUX
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 
 %if 0%{?fedora} || 0%{?rhel} >= 5
diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec
index cd5ca7c70..e30d303c6 100644
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/tdepowersave/tdepowersave.spec
@@ -86,7 +86,8 @@ BuildRequires:	libudev-devel
 
 # XSCREENSAVER support
 #  Disabled on RHEL4
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?suse_version}
+#  RHEL 8: available in EPEL
+%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
 BuildRequires:	xorg-x11-proto-devel