1 files changed, 43 insertions, 24 deletions

diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec
index a86ad59de..0504f5791 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}