RPM: merge redhat directory with master branch

2 files changed, 113 insertions, 76 deletions

diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 3d74ac57a..a18b8f583 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -1,58 +1,97 @@
-# Basic package informations
-%define tde_pkg amarok
+#
+# spec file for package amarok (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 amarok
+%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
 
-%define _docdir %{tde_docdir}
 
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	1.4.10
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Media player for TDE
+Group:		Applications/Multimedia
+URL:		http://www.trinitydesktop.org/
+#Url:		http://amarok.kde.org
 
-Name:			trinity-%{tde_pkg}
-Summary:		Media player
-Version:		1.4.10
-Release:		%{?!preversion:13}%{?preversion:12_%{preversion}}%{?dist}%{?_variant}
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Group:			Applications/Multimedia
-License:		GPLv2+
-Url:			http://amarok.kde.org
+#Vendor:		Trinity Desktop
+#Packager:	Francois Andriot <francois.andriot@free.fr>
 
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix:		%{tde_prefix}
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-Patch3:			amarok-3.5.13.1-fix_rhel4_libs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
+BuildRequires:	trinity-konqueror-devel >= %{tde_version}
+
+BuildRequires:	trinity-filesystem >= %{tde_version}
+Requires:		trinity-filesystem >= %{tde_version}
+
 BuildRequires:	desktop-file-utils
+BuildRequires:	cmake >= 2.8
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	gettext
 
-BuildRequires:	trinity-konqueror-devel >= %{tde_version}
+# ACL support
+BuildRequires:	libacl-devel
+
+# 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
 
+# ALSA support
 BuildRequires:	alsa-lib-devel
-BuildRequires:	desktop-file-utils
+
+# ESOUND support
 BuildRequires:	esound-devel
-BuildRequires:	gettext
+
+# PCRE support
 BuildRequires:	pcre-devel
-BuildRequires:	taglib-devel 
 
 # LIBTOOL
 BuildRequires:	libtool
@@ -66,9 +105,19 @@ BuildRequires:	postgresql-devel
 BuildRequires:	SDL-devel
 BuildRequires:	taglib-devel
 BuildRequires:	sqlite-devel
+
 # not used anymore, in favor of libvisual ? -- Rex
 #{?fedora:BuildRequires:  xmms-devel}
 
+# IDN support
+BuildRequires:	libidn-devel
+
+# GAMIN support
+#  Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires:	gamin-devel
+%endif
 
 # DBUS support
 %if 0%{?suse_version}
@@ -112,7 +161,6 @@ BuildRequires:	libgpod-devel >= 0.4.2
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_mtp 1
 BuildRequires:	libmtp-devel
-BuildRequires:	libmusicbrainz-devel
 %endif
 
 # Creative Nomad Jukebox
@@ -127,11 +175,26 @@ BuildRequires:	libnjb-devel
 BuildRequires:	libvisual-devel
 %endif
 
+# MUSICBRAINZ support
+%if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} >= 24
+BuildRequires:	libmusicbrainz5-devel
+%else
+BuildRequires:	libmusicbrainz-devel
+%endif
+%endif
+
 # TUNEPIMP support
+%if 0%{?pclinuxos}
+BuildRequires:	libofa-devel
+%endif
 %if 0%{?mgaversion} && 0%{?mgaversion} <= 2
 BuildRequires:	libtunepimp-devel
 %endif
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} < 1500
+BuildRequires:	libtunepimp-devel
+%endif
+%if 0%{?fedora} && 0%{?fedora} <= 23
 BuildRequires:	libtunepimp-devel
 %endif
 
@@ -144,15 +207,11 @@ BuildRequires:	%{_lib}inotifytools-devel
 %endif
 
 # XINE support
-%if 0%{?fedora} || 0%{?rhel} >= 4 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} == 18 || 0%{?fedora} == 19 || 0%{?rhel} >= 5
 %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
@@ -181,6 +240,9 @@ BuildRequires:	libmp4v2-devel
 # ruby
 BuildRequires:	ruby
 BuildRequires:	ruby-devel
+%if 0%{?fedora} >= 19
+BuildRequires:	rubypick
+%endif
 
 # To open the selected browser, works with Patch2
 Requires:		xdg-utils
@@ -223,7 +285,7 @@ Amarok is a multimedia player with:
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/servicetypes/*.desktop
 %{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_datadir}/config/amarokrc
+%{tde_confdir}/amarokrc
 %{tde_datadir}/config.kcfg/*.kcfg
 %{tde_datadir}/services/amarokitpc.protocol
 %{tde_datadir}/services/amaroklastfm.protocol
@@ -294,23 +356,12 @@ Amarok is a multimedia player with:
 %{tde_tdelibdir}/libamarok_aKode-engine.*
 %endif
 
-%post
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-%postun
-/sbin/ldconfig
-xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-xdg-desktop-menu forceupdate 2> /dev/null || :
-
-
 ##########
 
 %package ruby
 Summary:		%{name} Ruby support
 Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 # For dir ownership and some default plugins (lyrics)
 Requires:		ruby
 
@@ -319,7 +370,7 @@ Requires:		ruby
 
 %files ruby
 %defattr(-,root,root,-)
-%{tde_libdir}/ruby_lib/*
+%{tde_libdir}/ruby_lib/
 
 ##########
 
@@ -327,7 +378,7 @@ Requires:		ruby
 Summary:		Amarok konqueror (service menus, sidebar) support
 Group:			Applications/Multimedia
 
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		trinity-konqueror
 
 %description konqueror
@@ -347,7 +398,7 @@ Requires:		trinity-konqueror
 %package visualisation
 Summary:		Visualisation plugins for Amarok
 Group:			Applications/Multimedia
-Requires:		%{name} = %{version}-%{release}
+Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 # No plugins by default, we need libvisual-plugins
 #Requires:   libvisual-plugins
 
@@ -364,7 +415,7 @@ use any of xmms' visualisation plugins with Amarok.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
 %debug_package
 %endif
 
@@ -372,9 +423,14 @@ use any of xmms' visualisation plugins with Amarok.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%if 0%{?rhel} == 4
-%patch3 -p1 -b .rhel4
-%endif
+
+# Fix some Ruby stuff
+if ! ruby -rrbconfig -e "puts Config.expand( Config::MAKEFILE_CONFIG['MAJOR'] )" &>/dev/null; then
+  %__sed -i "amarok/src/mediadevice/daap/ConfigureChecks.cmake" \
+         -e "s|Config::|RbConfig::|g" \
+         -e "s|Config\.|RbConfig\.|g"
+fi
+
 
 %build
 unset QTDIR QTINC QTLIB
@@ -398,10 +454,12 @@ fi
   -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
   -DCMAKE_SKIP_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} \
@@ -454,5 +512,3 @@ done
 
 
 %changelog
-* Mon Jul 29 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-13
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/amarok/amarok-3.5.13.2.spec b/redhat/applications/amarok/amarok-3.5.13.2.spec
index 58764c6de..9f6c153db 100644
--- a/redhat/applications/amarok/amarok-3.5.13.2.spec
+++ b/redhat/applications/amarok/amarok-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg amarok
 %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:		Media player
 Version:		1.4.10
-Release:		%{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:12}%{?preversion:11_%{preversion}}%{?dist}
 
 Group:			Applications/Multimedia
 License:		GPLv2+
@@ -441,17 +436,3 @@ done
 
 
 %changelog
-* Sun Nov 24 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-12
-- Mageia 3: rebuild against Xine 1.2
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-11
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-10
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 1.4.10-9
-- Initial release for TDE 3.5.13.2
-
-* Tue Oct 02 2012 Francois Andriot <francois.andriot@free.fr> - 1.4.10-8
-- Initial release for TDE 3.5.13.1