RPM packaging: updates dependencies for 14.0.2

15 files changed, 36 insertions, 35 deletions

diff --git a/redhat/dependencies/akode/akode-14.0.0.spec b/redhat/dependencies/akode/akode-14.0.0.spec
index 3c9b0634c..a6ddf0473 100644
--- a/redhat/dependencies/akode/akode-14.0.0.spec
+++ b/redhat/dependencies/akode/akode-14.0.0.spec
@@ -43,11 +43,11 @@
 %endif
 
 Name:		trinity-akode 
-Summary: 	Audio-decoding framework
-Group: 		System Environment/Libraries
 Epoch:		%{tde_epoch}
 Version:	2.0.2
-Release:	1%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary: 	Audio-decoding framework
+Group: 		System Environment/Libraries
 URL:		http://www.kde-apps.org/content/show.php?content=30375
 #URL:		http://carewolf.com/akode/  
 
@@ -57,7 +57,7 @@ License:	GPL-2.0+
 License:	GPLv2+
 %endif
 
-Source0:	akode-%{tde_version}.tar.gz
+Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
 Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -162,7 +162,7 @@ Summary: Headers for developing programs that will use %{name}
 Group:   Development/Libraries
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %{?_with_jack:Requires: %{libakode}_jack_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
-%{?_with_pulseaudio:Requires: %{libakode}_polyp_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
+%{?_with_pulseaudio:Requires: %{libakode}_pulse_sink = %{?epoch:%{epoch}:}%{version}-%{release}}
 %{?_with_libsamplerate:Requires: %{libakode}_src_resampler = %{?epoch:%{epoch}:}%{version}-%{release}}
 %{?_with_libmad:Requires: %{libakode}_mpeg_decoder  = %{?epoch:%{epoch}:}%{version}-%{release}}
 Requires: pkgconfig
@@ -215,25 +215,25 @@ This package contains the Jack audio output backend for Akode.
 
 %if "%{?_with_pulseaudio}" != ""
 
-%package -n %{libakode}_polyp_sink
+%package -n %{libakode}_pulse_sink
 Summary: Pulseaudio output backend for %{name}
 Group:   Development/Libraries
-Provides: libakode_polyp_sink = %{version}-%{release}
+Provides: libakode_pulse_sink = %{version}-%{release}
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%description -n %{libakode}_polyp_sink
+%description -n %{libakode}_pulse_sink
 This package contains the pulseaudio backend for Akode.
 Recommended for network transparent audio.
 
-%files -n %{libakode}_polyp_sink
+%files -n %{libakode}_pulse_sink
 %defattr(-,root,root,-)
-%{_libdir}/libakode_polyp_sink.la
-%{_libdir}/libakode_polyp_sink.so
+%{_libdir}/libakode_pulse_sink.la
+%{_libdir}/libakode_pulse_sink.so
 
-%post -n %{libakode}_polyp_sink
+%post -n %{libakode}_pulse_sink
 /sbin/ldconfig
 
-%postun -n %{libakode}_polyp_sink
+%postun -n %{libakode}_pulse_sink
 /sbin/ldconfig
 
 %endif
@@ -300,7 +300,7 @@ This package contains the mad decoder for Akode.
 ##########
 
 %prep
-%setup -q -n akode-2.0.2
+%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 
 %build
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 499cb1f97..f049711a7 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -42,7 +42,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.5.10
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+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/
diff --git a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
index 06e8deaaf..790532b27 100644
--- a/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
+++ b/redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
@@ -31,7 +31,7 @@
 Name:		trinity-avahi-tqt
 Epoch:		%{tde_epoch}
 Version:	0.6.30
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Avahi TQt integration library
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
index b85589580..3370356df 100644
--- a/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-1-tqt/dbus-1-tqt-14.0.0.spec
@@ -31,7 +31,7 @@
 Name:		trinity-dbus-1-tqt
 Epoch:		%{tde_epoch}
 Version:	0.9
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Dbus bindings for the Trinity Qt [TQt] interface
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
index b2a45cb52..8a8c1b200 100644
--- a/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
+++ b/redhat/dependencies/dbus-tqt/dbus-tqt-14.0.0.spec
@@ -31,7 +31,7 @@
 Name:		trinity-dbus-tqt
 Epoch:		%{tde_epoch}
 Version:	0.63
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Simple inter-process messaging system
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
index b178fffa1..36816cd25 100644
--- a/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
+++ b/redhat/dependencies/libart-lgpl/libart-lgpl-14.0.0.spec
@@ -29,12 +29,13 @@
 %endif
 
 
-Name:           trinity-libart-lgpl
-Version:        2.3.22
-Release:		%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
-Summary:        Library of functions for 2D graphics
-Group:			System/Libraries
-URL:			http://www.trinitydesktop.org/
+Name:		trinity-libart-lgpl
+Epoch:		%{tde_epoch}
+Version:	2.3.22
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Summary:	Library of functions for 2D graphics
+Group:		System/Libraries
+URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
 License:	LGPL-2.0+
@@ -95,8 +96,8 @@ especially suitable for embedded applications.
 %package -n %{libart}_lgpl-devel
 Summary:        Library of functions for 2D graphics - development files
 Group:          Development/Libraries
-Provides:		libart_lgpl-devel = %{version}-%{release}
-Requires:       %{libart}_lgpl_2-2 = %{version}-%{release}
+Provides:		libart_lgpl-devel = %{tde_epoch}:%{version}-%{release}
+Requires:       %{libart}_lgpl_2-2 = %{tde_epoch}:%{version}-%{release}
 
 %description -n %{libart}_lgpl-devel
 A library of functions for 2D graphics supporting a superset of the
diff --git a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
index 8845fb7ca..fb01bb0cd 100644
--- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
+++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec
@@ -35,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	0.6.5
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	A client library that adds support for the CalDAV protocol (rfc4791)
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
index e9c111d1d..9ec474a4c 100644
--- a/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
+++ b/redhat/dependencies/libcarddav/libcarddav-14.0.0.spec
@@ -35,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	0.6.2
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	A portable CardDAV client implementation
 Group:		System/Libraries
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
index 13ce435c9..bfca722c1 100644
--- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
+++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec
@@ -42,7 +42,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	3.18.1
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	TQt bindings for Python
 Group:		Development/Libraries/Python
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec
index 02f2e45fd..282a271ee 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt-14.0.0.spec
@@ -48,7 +48,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	4.10.5
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	Python/C++ bindings generator runtime library
 Group:		Development/Tools/Building
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
index e3b193025..18138ca36 100644
--- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
+++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec
@@ -35,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	TLS plugin for the TQt Cryptographic Architecture
 Group:		Applications/Internet
 URL:		http://delta.affinix.com/qca/
diff --git a/redhat/dependencies/tqca/tqca-14.0.0.spec b/redhat/dependencies/tqca/tqca-14.0.0.spec
index 3eeb9671a..3aa3b7ba9 100644
--- a/redhat/dependencies/tqca/tqca-14.0.0.spec
+++ b/redhat/dependencies/tqca/tqca-14.0.0.spec
@@ -35,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	TQt Cryptographic Architecture
 Group:		Development/Libraries/C and C++
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
index f4c6aba1f..2c32bdb69 100644
--- a/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
+++ b/redhat/dependencies/tqscintilla/tqscintilla-14.0.0.spec
@@ -35,7 +35,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	1.7.1
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	TQt source code editing component based on Scintilla
 Group:		Development/Libraries/C and C++
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 2645aa112..57bb95833 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -29,7 +29,7 @@
 
 Name:		trinity-tqt3
 Version:	3.5.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	TQt GUI Library, Version 3
 Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 49b652985..38f661e4c 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -36,7 +36,7 @@
 Name:		trinity-%{tde_pkg}
 Epoch:		%{tde_epoch}
 Version:	4.2.0
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
+Release:	%{?tde_version}_%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 Summary:	The Trinity Qt Interface Libraries
 Group:		System/GUI/Other
 URL:		http://www.trinitydesktop.org/