RPM packaging: update smartcardauth, smb4k, soundkonverter, tde-guidance, tdeio-apt

1 files changed, 80 insertions, 38 deletions

diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
index 48516a2ee..320c979a7 100644
--- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
+++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec
@@ -1,52 +1,89 @@
-# Default version for this component
-%define tde_pkg soundkonverter
+#
+# spec file for package soundkonverter (version R14.0.0)
+#
+# 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
 %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 soundkonverter
+%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_tdedocdir}
 
+Name:		trinity-%{tde_pkg}
+Epoch:		%{tde_epoch}
+Version:	0.3.8
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Summary:	Audio converter frontend for Trinity
+Group:		Application/Multimedia
+URL:		http://potracegui.sourceforge.net
 
-Name:			trinity-%{tde_pkg}
-Summary:		audio converter frontend for Trinity
-Version:		0.3.8
-Release:		%{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant}
-
-License:		GPLv2+
-Group:			Application/Multimedia
+%if 0%{?suse_version}
+License:	GPL-2.0+
+%else
+License:	GPLv2+
+%endif
 
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://potracegui.sourceforge.net
+#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:	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
+
+# TAGLIB support
+BuildRequires:	taglib-devel
+
+# CDDA support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libcdda-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
+BuildRequires:	cdparanoia-devel
+%endif
+
 
 %description
 soundKonverter is a frontend to various audio converters.
@@ -79,10 +116,13 @@ transferring them to your media device.
 See the 'soundkonverter-trinity' package for more information.
 
 
-%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}}
@@ -123,17 +163,23 @@ export PATH="%{tde_bindir}:${PATH}"
 
 %find_lang %{tde_pkg}
 
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
+%endif
+
+
 %clean
 %__rm -rf %{buildroot}
 
 
 %post
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %postun
-update-desktop-database %{tde_appdir} > /dev/null
+update-desktop-database %{tde_tdeappdir} > /dev/null
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
@@ -146,11 +192,8 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 %{tde_tdeappdir}/soundkonverter.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/audiocd_extract_with_soundkonverter.desktop
 %{tde_datadir}/apps/soundkonverter
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/README
-%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
-%{tde_tdedocdir}/HTML/en/soundkonverter/common
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.cache.bz2
-%{tde_tdedocdir}/HTML/en/soundkonverter/index.docbook
+%exclude %{tde_datadir}/apps/soundkonverter/amarokscript/
+%{tde_tdedocdir}/HTML/en/soundkonverter/
 %{tde_datadir}/icons/hicolor/*/apps/soundkonverter*.png
 %{tde_datadir}/mimelnk/application/x-la.soundkonverter.desktop
 %{tde_datadir}/mimelnk/application/x-ofc.soundkonverter.desktop
@@ -168,10 +211,9 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
 
 %files amarok
 %defattr(-,root,root,-)
-%{tde_datadir}/apps/soundkonverter/amarokscript/README
-%{tde_datadir}/apps/soundkonverter/amarokscript/soundKonverter.rb
+%{tde_datadir}/apps/soundkonverter/amarokscript/
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3.8-5
+* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:0.3.8-1
 - Initial release for TDE 14.0.0