RPM: merge redhat directory with master branch

3 files changed, 90 insertions, 104 deletions

diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index fd64b2898..d38e6a27d 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -1,49 +1,83 @@
-# Default version for this component
-%define tde_pkg kaffeine
+#
+# spec file for package kaffeine (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
-
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
 %endif
-
-# TDE specific building variables
+%define tde_pkg kaffeine
+%define tde_prefix /opt/trinity
+%define tde_appdir %{tde_datadir}/applications
 %define tde_bindir %{tde_prefix}/bin
 %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
 
-%define _docdir %{tde_docdir}
 
 Name:			trinity-%{tde_pkg}
-Summary:		Xine-based media player
-
+Epoch:			%{tde_epoch}
 Version:		0.8.8
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
+Release:		%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:		Xine-based media player
 Group:			Applications/Multimedia
 URL:			http://kaffeine.sourceforge.net/
 
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
+
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
+Prefix:			%{_prefix}
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
+Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:		%{name}-rpmlintrc
+
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
 BuildRequires:	gettext
 
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+
+# 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
+
 # VORBIS support
 BuildRequires:	libvorbis-devel
 
@@ -56,7 +90,7 @@ BuildRequires:	libcdda-devel
 BuildRequires:	cdparanoia
 BuildRequires:	cdparanoia-devel
 %endif
-%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19
+%if 0%{?suse_version} >= 1210 || 0%{?fedora} >= 19 || 0%{?rhel} >= 7
 BuildRequires:	libcdio-paranoia-devel
 %endif
 
@@ -87,20 +121,21 @@ BuildRequires: libxcb-devel
 # GSTREAMER support
 %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gstreamer 1
-%if 0%{?suse_version}
-BuildRequires:	gstreamer-0_10-devel
-BuildRequires:	gstreamer-0_10-plugins-base-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}gstreamer1.0-devel
+BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
 %endif
 %if 0%{?rhel} == 4
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-devel
 %endif
-%if 0%{?rhel} >= 5 || 0%{?fedora}
-BuildRequires:	gstreamer-plugins-base-devel >= 0.10
+%if 0%{?rhel} == 5 || 0%{?rhel} == 6 || 0%{?suse_version}
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libgstreamer-devel >= 0.10
-BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
+%if 0%{?rhel} >= 7 || 0%{?fedora}
+BuildRequires:	gstreamer1-devel >= 1.0
+BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
 %endif
 %endif
 
@@ -108,12 +143,8 @@ BuildRequires:	libgstreamer-plugins-base-devel >= 0.10
 %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
@@ -123,11 +154,29 @@ BuildRequires: libxine-devel
 %endif
 
 # LAME support
+%if 0%{?opensuse_bs} == 0
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel}
+%define with_lame 1
+
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?pclinuxos}
+BuildRequires:		liblame-devel
+%else
+%if 0%{?mgaversion} >= 6
+BuildRequires:		%{_lib}mp3lame-devel
+%else
+BuildRequires:		%{_lib}lame-devel
+%endif
+%endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	libmp3lame-devel
-%else
+%endif
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	lame-devel
 %endif
+%endif
+%endif
 
 # WTF support
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -139,7 +188,7 @@ BuildRequires:	kernel-headers
 BuildRequires:	glibc-kernheaders 
 %endif
 
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description
 Kaffeine is a xine-based media player for TDE.  It plays back CDs,
@@ -167,24 +216,12 @@ Konqueror plugin, OSD and much more.
 %{tde_datadir}/service*/*.desktop
 %{tde_tdedocdir}/HTML/en/kaffeine/
 
-%post
-touch --no-create %{tde_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{tde_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
-%postun
-touch --no-create %{_datadir}/icons/hicolor ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database >& /dev/null ||:
-/sbin/ldconfig || :
-
 ##########
 
 %package devel
 Summary:		Development files for %{name}
 Group:			Development/Libraries
-Requires:		%{name}-libs = %{version}-%{release}
+Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-tdelibs-devel
 
 %description devel
@@ -196,12 +233,6 @@ Requires:		trinity-tdelibs-devel
 %{tde_libdir}/lib*.so
 %exclude %{tde_libdir}/libkaffeinepart.so
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 ##########
 
 %package libs
@@ -209,7 +240,7 @@ Summary:		%{name} runtime libraries
 Group:			System Environment/Libraries
 
 # include to be paranoid, installing libs-only is still mostly untested -- Rex
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 %description libs
 %{summary}.
@@ -218,15 +249,9 @@ Requires:		%{name} = %{version}-%{release}
 %defattr(-,root,root,-)
 %{tde_libdir}/lib*.so.*
 
-%post libs
-/sbin/ldconfig || :
-
-%postun libs
-/sbin/ldconfig || :
-
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -236,7 +261,7 @@ Requires:		%{name} = %{version}-%{release}
 %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"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -291,5 +316,3 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-8
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
index 298618821..e46e985cc 100644
--- a/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg kaffeine
 %define tde_version 3.5.13.2
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 # TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
@@ -26,7 +21,7 @@ Name:			trinity-%{tde_pkg}
 Summary:		Xine-based media player
 
 Version:		0.8.8
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Multimedia
@@ -236,7 +231,7 @@ Requires:		%{name} = %{version}-%{release}
 %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"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -292,37 +287,3 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-7
-- Mageia 3: rebuild against Xine 1.2
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-6
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.8.8-5
-- Initial release for TDE 3.5.13.2
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-4
-- Initial release for TDE 3.5.13.1
-
-* Fri Aug 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-3
-- Add support for Mageia 2 and Mandriva 2011
-- Added automake initialization with proper program name and version [Bug #858] [Commit #4e982fa3]
-- Fixed online hyperlink to win32 codecs download location. [Commit #5086f358]
-
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
-- Rebuilt for Fedora 17
-- Adds more patches from GIT.
-
-* Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
-- Updates version to 0.8.8
-- Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]
-- Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
-- Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
-- Add man page
-
-* Sun Dec 04 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-2
-- Disable 'libxcb-devel' for RHEL 5 compilation
-- Fix HTML directory location
-
-* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
-- Spec file based on Fedora 8 'kaffeine-0.8.6-3'
diff --git a/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc b/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/applications/kaffeine/trinity-kaffeine-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)