3 files changed, 3 insertions, 341 deletions
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.patch b/redhat/applications/kmplayer/kmplayer-14.0.0.patch
deleted file mode 100644
index fba761b15..000000000
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/gstplayer.cpp b/src/gstplayer.cpp
-index c4bf580..0585ac9 100644
---- a/src/gstplayer.cpp
-+++ b/src/gstplayer.cpp
-@@ -750,7 +750,7 @@ void KGStreamerPlayer::seek (int val /*offset_in_deciseconds*/) {
- void KGStreamerPlayer::volume (int val) {
-     //fprintf (stderr, "position %d\n", val);
-     if (gst_elm_play)
--        g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, 0L);
-+        g_object_set (G_OBJECT (gst_elm_play), "volume", 1.0*val/100, NULL);
- }
- 
- void KGStreamerPlayer::updatePosition () {
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.0.spec b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
index 7c0a38708..f19972c3b 100644
--- a/redhat/applications/kmplayer/kmplayer-14.0.0.spec
+++ b/redhat/applications/kmplayer/kmplayer-14.0.0.spec
@@ -23,6 +23,7 @@
 %define tde_pkg kmplayer
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -56,7 +57,6 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Patch0:			%{tde_pkg}-14.0.0.patch
 
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
@@ -214,7 +214,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
-%{tde_datadir}/config/kmplayerrc
+%{tde_confdir}/kmplayerrc
 %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %{tde_datadir}/apps/kmplayer/noise.gif
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
@@ -268,7 +268,6 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch0 -p1 -b .orig
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -279,6 +278,7 @@ Documention for KMPlayer, a basic audio/video viewer application for TDE.
 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} \
diff --git a/redhat/applications/kmplayer/kmplayer-14.0.1.spec b/redhat/applications/kmplayer/kmplayer-14.0.1.spec
deleted file mode 100644
index f19972c3b..000000000
--- a/redhat/applications/kmplayer/kmplayer-14.0.1.spec
+++ /dev/null
@@ -1,325 +0,0 @@
-#
-# spec file for package kmplayer (version R14)
-#
-# Copyright (c) 2014 Trinity Desktop Environment
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-#
-# Please submit bugfixes or comments via http://www.trinitydesktop.org/
-#
-
-# TDE variables
-%define tde_epoch 2
-%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
-%endif
-%define tde_pkg kmplayer
-%define tde_prefix /opt/trinity
-%define tde_bindir %{tde_prefix}/bin
-%define tde_confdir %{_sysconfdir}/trinity
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_tdeappdir %{tde_datadir}/applications/tde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-
-Name:		trinity-%{tde_pkg}
-Epoch:		%{tde_epoch}
-Version:	0.10.0c
-Release:	%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
-Summary:	Media player for Trinity
-Group:		Applications/Multimedia
-URL:		http://www.trinitydesktop.org/
-#URL:		http://kmplayer.kde.org
-
-%if 0%{?suse_version}
-License:	GPL-2.0+
-%else
-License:	GPLv2+
-%endif
-
-#Vendor:		Trinity Desktop
-#Packager:	Francois Andriot <francois.andriot@free.fr>
-
-Prefix:		%{tde_prefix}
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	autoconf automake libtool m4
-BuildRequires:	gcc-c++
-BuildRequires:	pkgconfig
-BuildRequires:	libtool
-
-# SUSE desktop files utility
-%if 0%{?suse_version}
-BuildRequires:	update-desktop-files
-%endif
-
-%if 0%{?opensuse_bs} && 0%{?suse_version}
-# for xdg-menu script
-BuildRequires:	brp-check-trinity
-%endif
-
-# DBUS support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
-BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
-%endif
-
-# GSTREAMER support
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires:	libgstreamer0.10-devel
-%else
-BuildRequires:	%{_lib}gstreamer0.10-devel
-%endif
-BuildRequires:	%{_lib}gstreamer-plugins-base0.10-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	gstreamer-devel
-#BuildRequires:	gstreamer-plugins-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	gstreamer-devel
-BuildRequires:	gstreamer-plugins-base-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-0_10-devel
-BuildRequires:	gstreamer-0_10-plugins-base-devel
-%endif
-
-# XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
-%define with_xine 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos}
-BuildRequires: %{_lib}xine-devel
-%else
-BuildRequires: %{_lib}xine1.2-devel
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel}
-BuildRequires: xine-lib-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires: libxine-devel
-%endif
-%endif
-
-# X11 stuff
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libxt-devel
-BuildRequires:	libxv-devel
-%endif
-%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
-BuildRequires:	libXv-devel
-%endif
-%if 0%{?rhel} == 4
-BuildRequires:	xorg-x11-devel 
-%endif
-%if 0%{?suse_version} == 1140
-BuildRequires:	xorg-x11-libXv-devel
-%endif
-
-# GTK2 stuff
-BuildRequires:	gtk2-devel
-
-# DBUS stuff
-%if 0%{?suse_version}
-BuildRequires:	dbus-1-glib-devel
-%else
-BuildRequires:	dbus-glib-devel
-%endif
-
-Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
-
-
-%description
-A basic audio/video viewer application for Trinity.
-
-KMPlayer can:
-* play DVD (DVDNav only with the Xine player)
-* play VCD
-* let the backend players play from a pipe (read from stdin)
-* play from a TV device (experimental)
-* show backend player's console output
-* launch ffserver (only 0.4.8 works) when viewing from a v4l device
-* DCOP KMediaPlayer interface support
-* VDR viewer frontend (with *kxvplayer), configure VDR keys with standard TDE
-  shortcut configure window
-* Lots of configurable shortcuts. Highly recommended for the VDR keys
-  (if you have VDR) and volume increase/decrease
-
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
-%files -f %{tde_pkg}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog INSTALL README TODO kmplayer.lsm
-%{tde_bindir}/kmplayer
-%{tde_bindir}/knpplayer
-%{tde_bindir}/kxvplayer
-%{tde_libdir}/libtdeinit_kmplayer.la
-%{tde_libdir}/libtdeinit_kmplayer.so
-%{tde_tdelibdir}/kmplayer.la
-%{tde_tdelibdir}/kmplayer.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
-%exclude %{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/apps/kmplayer/
-
-##########
-
-%package base
-Group:			Applications/Multimedia
-Summary:		Base files for KMPlayer [Trinity]
-
-%description base
-Core files needed for KMPlayer.
-
-%post base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%postun base
-touch --no-create %{tde_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
-
-%files base
-%defattr(-,root,root,-)
-%{tde_libdir}/libkmplayercommon.la
-%{tde_libdir}/libkmplayercommon.so
-%{tde_bindir}/kgstplayer
-%{tde_bindir}/kxineplayer
-%{tde_confdir}/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
-
-##########
-
-%package konq-plugins
-Group:			Applications/Multimedia
-Requires:		%{name}-base = %{?epoch:%{epoch}:}%{version}-%{release}
-Requires:		trinity-konqueror >= %{tde_version}
-Summary:		KMPlayer plugin for KHTML/Konqueror [Trinity]
-
-%description konq-plugins
-This plugin enables audio/video playback inside konqueror, using Xine (with
-*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
-tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
-browser plugins.
-
-%files konq-plugins
-%defattr(-,root,root,-)
-%{tde_tdelibdir}/libkmplayerpart.la
-%{tde_tdelibdir}/libkmplayerpart.so
-%{tde_datadir}/apps/kmplayer/kmplayerpartui.rc
-%{tde_datadir}/apps/kmplayer/pluginsinfo
-%{tde_datadir}/services/kmplayer_part.desktop
-
-##########
-
-%package doc
-Group:			Applications/Multimedia
-Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-Summary:		Handbook for KMPlayer [Trinity]
-
-%description doc
-Documention for KMPlayer, a basic audio/video viewer application for TDE.
-
-%files doc
-%defattr(-,root,root,-)
-%{tde_tdedocdir}/HTML/*/kmplayer
-
-##########
-
-%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
-%debug_package
-%endif
-
-##########
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/config/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} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-new-ldflags \
-  --enable-final \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
-
-%__make %{?_smp_mflags} || %__make
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang %{tde_pkg}
-
-# Removes unwanted files
-%__rm -f %{?buildroot}%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
-
-# Updates applications categories for openSUSE
-%if 0%{?suse_version}
-%suse_update_desktop_file -r "%{tde_pkg}" TDE AudioVideo Player Video
-%endif
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.10.0c-1
-- Initial release for TDE 14.0.0