RPM: merge redhat directory with master branch

2 files changed, 102 insertions, 84 deletions

diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec
index 40ad0415c..7b15298df 100644
--- a/redhat/applications/tderadio/tderadio-14.0.0.spec
+++ b/redhat/applications/tderadio/tderadio-14.0.0.spec
@@ -1,77 +1,122 @@
-# Default version for this component
-%define tde_pkg tderadio
-%define tde_version 14.0.0
+#
+# spec file for package tderadio (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/
+#
 
-# 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
+%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%define with_lirc 1
 %endif
 
-# TDE specific building variables
+# TDE variables
+%define tde_epoch 2
+%if "%{?tde_version}" == ""
+%define tde_version 14.0.0
+%endif
+%define tde_pkg tderadio
+%define tde_prefix /opt/trinity
 %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_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/tde
+%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}
 
-%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
-%define with_lirc 1
-%endif
-
-Name:			trinity-%{tde_pkg}
-Summary:		Comfortable Radio Application for TDE [Trinity]
-Version:		0.1.1.1
-Release:		%{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant}
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.1.1.1
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Comfortable Radio Application for TDE
+Group:		Applications/Utilities
+URL:		http://www.trinitydesktop.org/
 
-License:		GPLv2+
-Group:			Applications/Utilities
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.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
 
-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:	desktop-file-utils
-
 BuildRequires:	gettext
+
+BuildRequires:	autoconf automake libtool m4
+BuildRequires:	gcc-c++
+BuildRequires:	pkgconfig
+BuildRequires:	fdupes
+
+# 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
+
 BuildRequires:	libsndfile-devel
 %{?with_lirc:BuildRequires:	lirc-devel}
 
+# 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}
-BuildRequires:	%{_lib}twolame-devel
+%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:	libtwolame-devel
+BuildRequires:	libmp3lame-devel
 %endif
-%if 0%{?rhel} || 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	lame-devel
 %endif
+%endif
+%endif
 
 Obsoletes:		trinity-kradio < %{version}-%{release}
 Provides:		trinity-kradio = %{version}-%{release}
 
+
 %description
-KRadio is a comfortable radio application for Trinity with support for 
+TDERadio is a comfortable radio application for Trinity with support for 
 V4L and V4L2 radio cards drivers.
 
-KRadio currently provides
+TDERadio currently provides
 
  * V4L/V4L2 radio support
 %if 0%{?with_lirc}
@@ -84,22 +129,26 @@ KRadio currently provides
  * Extendable plugin architecture
 
 This package also includes a growing collection of station preset
-files for many cities around the world contributed by KRadio users.
+files for many cities around the world contributed by TDERadio users.
 
-As KRadio is based on an extendable plugin architecture, contributions
+As TDERadio is based on an extendable plugin architecture, contributions
 of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+##########
+
+%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"
+%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -133,6 +182,10 @@ export PATH="%{tde_bindir}:${PATH}"
   --enable-alsa \
   --enable-oss
 
+%if 0%{?mgaversion} >= 6 || 0%{?pclinuxos} >= 2018
+%__sed -i "tderadio3/plugins/"*"/Makefile" -e "s|-Wl,--no-undefined||"
+%endif
+
 %__make %{?_smp_mflags}
 
 
@@ -143,34 +196,28 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
 
 
-%post
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-%postun
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/${f} || :
-  gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} || :
-done
-update-desktop-database %{tde_appdir} -q &> /dev/null ||:
-
-
 %files -f %{tde_pkg}.lang
 %defattr(-,root,root,-)
 %{tde_bindir}/convert-presets
 %{tde_bindir}/tderadio
+%dir %{tde_libdir}/tderadio
+%dir %{tde_libdir}/tderadio/plugins
 %{tde_libdir}/tderadio/plugins/*.la
 %{tde_libdir}/tderadio/plugins/*.so
 %{tde_tdeappdir}/tderadio.desktop
 %{tde_datadir}/apps/tderadio/
+%dir %{tde_datadir}/icons/hicolor/256x256
+%dir %{tde_datadir}/icons/hicolor/256x256/actions
 %{tde_datadir}/icons/hicolor/*/*/tderadio*.png
 %{tde_datadir}/icons/locolor/*/*/tderadio*.png
 %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
@@ -178,5 +225,3 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
 %{tde_tdedocdir}/HTML/en/tderadio/
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-8
-- Initial release for TDE 14.0.0
diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec
index 0e30e1b7a..04b82fc4e 100644
--- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec
+++ b/redhat/applications/tderadio/tderadio-3.5.13.2.spec
@@ -2,11 +2,6 @@
 %define tde_pkg tderadio
 %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
@@ -30,7 +25,7 @@
 Name:			trinity-%{tde_pkg}
 Summary:		Comfortable Radio Application for TDE [Trinity]
 Version:		0.1.1.1
-Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}
 
 License:		GPLv2+
 Group:			Applications/Utilities
@@ -99,7 +94,7 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome.
 %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"
 
 
@@ -174,25 +169,3 @@ update-desktop-database %{tde_appdir} -q &> /dev/null ||:
 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
 
 %changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-7
-- Build for Fedora 19
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-6
-- Initial release for TDE 3.5.13.2
-
-* Sat Dec 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-5
-- Updates presets
-
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-4
-- Initial release for TDE 3.5.13.1
-
-* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-3
-- Rebuild for RHEL 5
-- Fix postinstall
-
-* Wed May 02 2012 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-2
-- Rebuild for Fedora 17
-- Fix HTML directory location
-
-* Sat Nov 19 2011 Francois Andriot <francois.andriot@free.fr> - 0.1.1.1-1
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16