RPM: merge redhat directory with master branch

3 files changed, 33 insertions, 67 deletions

diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 244c370e3..765d14efa 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package arts (version R14.0.0)
+# spec file for package arts (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,10 +21,13 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg arts
 %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
@@ -35,16 +38,11 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.5.10
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
 URL:		http://www.trinitydesktop.org/
@@ -62,6 +60,7 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
+Source1:	%{name}-rpmlintrc
 
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
@@ -79,18 +78,17 @@ BuildRequires:	libvorbis-devel
 
 # ESOUND support
 %define with_esound 1
+%if 0%{?with_esound}
 BuildRequires:	esound-devel
+%endif
 
 # JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define with_jack 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define jack_devel %{_lib}jack-devel
-%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 %define jack_devel jack-audio-connection-kit-devel
 %endif
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define jack_devel libjack-devel
 %endif
 BuildRequires:	%{jack_devel}
@@ -98,7 +96,7 @@ BuildRequires:	%{jack_devel}
 
 # LIBTOOL
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
+BuildRequires:	libltdl-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libtool-ltdl-devel
@@ -115,10 +113,7 @@ BuildRequires:	libtool
 %ifarch %{ix86} x86_64
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} 
 %define with_libmad 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define mad_devel %{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion}
 %define mad_devel libmad-devel
 %endif
 BuildRequires:		%{mad_devel}
@@ -169,12 +164,6 @@ playing a wave file with some effects.
 # The '.la' files are needed for runtime, not devel !
 %{tde_libdir}/lib*.la
 
-%post
-/sbin/ldconfig || :
-
-%postun
-/sbin/ldconfig || :
-
 ##########
 
 %package devel
@@ -188,7 +177,7 @@ Obsoletes:	arts-devel
 Requires:	alsa-lib-devel
 Requires:	audiofile-devel
 Requires:	libvorbis-devel
-Requires:	esound-devel
+%{?with_esound:Requires:	esound-devel}
 %{?with_libmad:Requires: %{mad_devel}}
 %{?with_jack:Requires: %{jack_devel}}
 
@@ -216,12 +205,6 @@ playing a wave file with some effects.
 %{tde_libdir}/pkgconfig/*.pc
 %{tde_libdir}/*.a
 
-%post devel
-/sbin/ldconfig || :
-
-%postun devel
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?with_pulseaudio}
@@ -237,7 +220,7 @@ intended for systems running the Pulseaudio server.
 
 %files config-pulseaudio
 %defattr(-,root,root,-)
-%{tde_datadir}/config/kcmartsrc
+%{tde_confdir}/kcmartsrc
 
 %endif
 
@@ -299,13 +282,14 @@ fi
 
 # Installs the Pulseaudio configuration file
 %if 0%{?with_pulseaudio}
-cat <<EOF >"%{?buildroot}%{tde_datadir}/config/kcmartsrc"
+%__mkdir_p "%{?buildroot}%{tde_confdir}"
+cat <<EOF >"%{?buildroot}%{tde_confdir}/kcmartsrc"
 [Arts]
 Arguments=\s-F 10 -S 4096 -a esd -n -s 1 -m artsmessage -c drkonqi -l 3 -f
 NetworkTransparent=true
 SuspendTime=1
 EOF
-chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
+chmod 644 "%{?buildroot}%{tde_confdir}/kcmartsrc"
 %endif
 
 # Add supplementary folders
@@ -317,5 +301,3 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 2:1.5.10-2
-- Initial release for TDE R14.0.0
diff --git a/redhat/dependencies/arts/arts-3.5.13.2.spec b/redhat/dependencies/arts/arts-3.5.13.2.spec
index ad8473da4..02e031f9e 100644
--- a/redhat/dependencies/arts/arts-3.5.13.2.spec
+++ b/redhat/dependencies/arts/arts-3.5.13.2.spec
@@ -12,7 +12,7 @@
 # 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/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -29,21 +29,17 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_sbindir %{tde_prefix}/sbin
 %define tde_tdeappdir %{tde_datadir}/applications/kde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# 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
-
 
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.5.10
-Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:2}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
 Group:		System Environment/Daemons 
 URL:		http://www.trinitydesktop.org/
@@ -62,6 +58,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
+%{?tde_patch:Patch1:			%{tde_pkg}-%{tde_version}.patch}
+
 BuildRequires:	libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-filesystem >= %{tde_version}
 Requires:		trinity-filesystem >= %{tde_version}
@@ -83,25 +81,22 @@ BuildRequires:	esound-devel
 # JACK support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?with_jack}
 %define with_jack 1
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%define jack_devel %{_lib}jack-devel
-%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 %define jack_devel jack-audio-connection-kit-devel
 %endif
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
 %define jack_devel libjack-devel
 %endif
 BuildRequires:	%{jack_devel}
 %endif
 
 # LIBTOOL
-%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}ltdl-devel
-%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libtool-ltdl-devel
 %endif
+%if  0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	libltdl-devel
+%endif
 %if 0%{?suse_version}
 %if 0%{?suse_version} >= 1220
 BuildRequires:	libltdl-devel
@@ -110,16 +105,14 @@ BuildRequires:	libtool
 %endif
 %endif
 
+# UUID support
+BuildRequires: libuuid-devel
+
 # MAD support
 %ifarch %{ix86} x86_64
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} 
 %define with_libmad 1
-%if 0%{?mdkversion} || 0%{?mgaversion}
-%define mad_devel %{_lib}mad-devel
-%endif
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define mad_devel libmad-devel
-%endif
 BuildRequires:		%{mad_devel}
 %endif
 %endif
@@ -250,6 +243,7 @@ intended for systems running the Pulseaudio server.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
 
 
 %build
@@ -316,15 +310,3 @@ chmod 644 "%{?buildroot}%{tde_datadir}/config/kcmartsrc"
 
 
 %changelog
-* Sat Oct 11 2014 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-2
-- Rebuild.
-
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1:1.5.10-1
-- Build for Fedora 19
-
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
-
diff --git a/redhat/dependencies/arts/trinity-arts-rpmlintrc b/redhat/dependencies/arts/trinity-arts-rpmlintrc
new file mode 100644
index 000000000..529351884
--- /dev/null
+++ b/redhat/dependencies/arts/trinity-arts-rpmlintrc
@@ -0,0 +1,2 @@
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)