RPM: massive update and cleanup

2 files changed, 4 insertions, 172 deletions

diff --git a/redhat/applications/tderadio/tderadio-3.5.13.2.spec b/redhat/applications/tderadio/tderadio-3.5.13.2.spec
deleted file mode 100644
index 04b82fc4e..000000000
--- a/redhat/applications/tderadio/tderadio-3.5.13.2.spec
+++ /dev/null
@@ -1,171 +0,0 @@
-# Default version for this component
-%define tde_pkg tderadio
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%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}/kde
-%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:7}%{?preversion:6_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://www.trinitydesktop.org/
-
-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:	libsndfile-devel
-%{?with_lirc:BuildRequires:	lirc-devel}
-
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}twolame-devel
-%endif
-%if 0%{?suse_version}
-BuildRequires:	libtwolame-devel
-%endif
-%if 0%{?rhel} || 0%{?fedora}
-BuildRequires:	lame-devel
-%endif
-
-Obsoletes:		trinity-kradio < %{version}-%{release}
-Provides:		trinity-kradio = %{version}-%{release}
-
-%description
-KRadio is a comfortable radio application for Trinity with support for 
-V4L and V4L2 radio cards drivers.
-
-KRadio currently provides
-
- * V4L/V4L2 radio support
-%if 0%{?with_lirc}
- * Remote control support (LIRC)
-%endif
- * Alarms, sleep Countdown
- * Several GUI Controls (Docking Menu, Station Quickbar, Radio Display)
- * Recording capabilities, including MP3 and Ogg/Vorbis encoding
- * Timeshifter functionality
- * Extendable plugin architecture
-
-This package also includes a growing collection of station preset
-files for many cities around the world contributed by KRadio users.
-
-As KRadio 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}
-%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  --includedir=%{tde_tdeincludedir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  \
-  %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \
-  --enable-v4l2 \
-  --enable-lame \
-  --enable-ogg \
-  --enable-alsa \
-  --enable-oss
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kradio
-
-%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 kradio.lang
-%defattr(-,root,root,-)
-%{tde_bindir}/convert-presets
-%{tde_bindir}/kradio
-%{tde_libdir}/kradio/plugins/*.la
-%{tde_libdir}/kradio/plugins/*.so
-%{tde_tdeappdir}/kradio.desktop
-%{tde_datadir}/apps/kradio/
-%{tde_datadir}/icons/hicolor/*/*/kradio*.png
-%{tde_datadir}/icons/locolor/*/*/kradio*.png
-%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
-%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
-
-%changelog
diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio.spec
index 7b15298df..57216d054 100644
--- a/redhat/applications/tderadio/tderadio-14.0.0.spec
+++ b/redhat/applications/tderadio/tderadio.spec
@@ -22,7 +22,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tderadio
 %define tde_prefix /opt/trinity
@@ -166,6 +166,7 @@ export PATH="%{tde_bindir}:${PATH}"
   --libdir=%{tde_libdir} \
   --mandir=%{tde_mandir} \
   --includedir=%{tde_tdeincludedir} \
+  --program-prefix="" \
   \
   --disable-dependency-tracking \
   --disable-debug \
@@ -221,6 +222,8 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/hicolor/*/*/tderadio*.png
 %{tde_datadir}/icons/locolor/*/*/tderadio*.png
 %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
+%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
+%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo
 %lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo
 %{tde_tdedocdir}/HTML/en/tderadio/