RPM packaging: updates dependencies for 14.0.2

21 files changed, 59 insertions, 268 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index f9e894c98..71f42c3da 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 PACKAGING_DIR := $(shell cd ..; pwd)
 PATH := $(PATH):$(shell pwd)/build
-TDE_VERSION := 14.0.0
+TDE_VERSION := 14.0.2
 
 buildpkg = \
   @echo "Now processing '$(1)' [from $(PACKAGING_DIR)]."; \
diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh
index 5c3febcd5..705d479b8 100644
--- a/redhat/buildenv.sh
+++ b/redhat/buildenv.sh
@@ -3,7 +3,7 @@
 # This file can be sourced in your .bashrc
 
 TDE_BASEDIR=~/tde
-[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.1"
+[ -z "${TDE_VERSION}" ] && TDE_VERSION="14.0.2"
 TDE_GITBASESRC=${TDE_BASEDIR}/tde_r14
 TDE_GITBASEPKG=${TDE_BASEDIR}/tde-packaging/redhat
 TDE_TARBALLS=${TDE_BASEDIR}/tde-tarballs/${TDE_VERSION}
@@ -19,7 +19,7 @@ export DIST="$( "${TDE_GITBASEPKG}/build/rpmdist.sh" --dist )"
 alias cdrpm='cd ~/rpmbuild/RPMS/RPMS${DIST}'
 
 # Build a single tarball (execute from GIT directory)
-alias tdp4='TARGET=14.0.1 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
+alias tdp4='TARGET=14.0.2 SUFFIX=0 TARBALL_DIR=${TDE_TARBALLS}/main COMPRESS=gzip ${TDE_GITBASESRC}/scripts/create_tarball'
 
 # Rebuild all tarballs
 if [ -x /usr/bin/pigz ]; then
@@ -38,17 +38,17 @@ grp3() {
 }
 
 grp4() {
-  build_rpm_package.sh "${1}" "14.0.1"
+  build_rpm_package.sh "${1}" "14.0.2"
 }
 
 # Check if tarballs are more recent than installed packages
 checknew() {
-  find ~/tde/tde-tarballs/14.0.1 -name "trinity-*.tar.gz" | while read f; do
+  find ~/tde/tde-tarballs/14.0.2 -name "trinity-*.tar.gz" | while read f; do
     TAR="${f##*/}"
     NAME="${TAR%-*}"
     
     if rpm -q "${NAME}" &>/dev/null; then
-      set $(rpm -q --qf "%{name} 14.0.1 %{release}" ${NAME} )
+      set $(rpm -q --qf "%{name} 14.0.2 %{release}" ${NAME} )
       B="$1-$2~${3#*_}"
       A=${TAR%.tar.gz}
       B=${B%.opt}
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/
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
index f3cb8e34f..7a292aa39 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-source
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/f$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
index c3450eaed..f415f006a 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -1,23 +1,23 @@
 [trinity-3.5.13]
 name=trinity-3.5.13
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-$basearch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-noarch]
 name=trinity-3.5.13-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-noarch.list
 enabled=1
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
 
 [trinity-3.5.13-source]
 name=trinity-3.5.13-noarch
-#baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
-mirrorlist=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
+#baseurl=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
+mirrorlist=http://mirror.ppa.trinitydesktop.org/trinity/trinity/rpm/el$releasever/trinity-3.5.13-SRPMS.list
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-trinity
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index 7f32d520d..266b6d829 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -278,11 +278,6 @@ Requires:	trinity-style-ia-ora
 Requires:	trinity-theme-baghira
 
 
-# GLIBC too old on RHEL <= 5
-%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
-#Requires:	trinity-twinkle
-%endif
-
 %description extras
 %{summary}
 
@@ -329,8 +324,10 @@ Requires(pre):	coreutils
 
 %prep
 
+
 %build
 
+
 %install
 %__rm -rf %{?buildroot}
 %__mkdir_p "%{?buildroot}%{_sysconfdir}/yum.repos.d"
@@ -363,5 +360,8 @@ Requires(pre):	coreutils
 
 
 %changelog
+* Wed Oct 21 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.1-2
+- Change RHEL/Fedora URL to Trinity mirrors instead of main server.
+
 * Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
 - Initial build for TDE R14
diff --git a/redhat/genrpm.sh b/redhat/genrpm.sh
deleted file mode 100755
index 18857cf1a..000000000
--- a/redhat/genrpm.sh
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/bin/bash
-
-cd "$( dirname "$0" )"
-ARGS=""
-
-DIST="$(rpmdist.sh --dist)"
-
-# CCACHE related stuff
-if [ ! -d /var/cache/ccache ]; then
-  [ -z "${DIST}" ] && DIST="$(rpm -E "%{dist}")"
-  if [ -n "${DIST}" ]; then
-    export CCACHE_DIR=~/.ccache${DIST}.$(uname -m)
-  fi
-fi
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    "--auto"|"-a") AUTO=1;;
-    "--version"|"-v") REQVERSION="$2"; shift;;
-    "--"*) ARGS="${ARGS} $1";;
-    *) COMP="${1%%/}";;
-  esac
-  shift
-done
-
-if [ -d ~/tde/tde-tarballs/${REQVERSION} ]; then
-  eval TARBALLS_DIR=~/tde/tde-tarballs/${REQVERSION}
-else
-  eval TARBALLS_DIR=~/tde/tde-tarballs/3.5.13.2
-  #eval TARBALLS_DIR=~/tde/tde-tarballs/14.0.0
-fi
-
-#clear
-cat <<EOF
-$(< /etc/redhat-release) [$(uname -m)]
-This script generates RPM of TDE from source tarball.
-
-EOF
-
-# Checks RPMBUILD environment
-RHEL="$( rpm -E "%{rhel}" )"
-FEDORA="$( rpm -E "%{fedora}" )"
-SUSE="$( rpm -E "%{suse_version}" )"
-PCLINUXOS="$( rpm -E "%{pclinuxos}" )"
-MGAVERSION="$( rpm -E "%{mgaversion}" )"
-if [ "${RHEL}" = "%{rhel}" ] && [ "${FEDORA}" = "%{fedora}" ] && [ "${SUSE}" = "%{suse_version}" ] && [ "${PCLINUXOS}" = "%{pclinuxos}" ] && [ "${MGAVERSION}" = "%{mgaversion}" ] ; then
-  cat <<EOF
-Error: RPM macro %rhel or %fedora must be set to the distribution version to build !
-E.g:
-  %rhel 6 
-or:
-  %fedora 15
-EOF
-  exit 1
-fi
-
-# Checks TDE version to use
-#if [ -z "${REQVERSION}" ]; then
-#	REQVERSION="3.5.13"
-#fi
-
-if [ -z "${COMP}" ]; then
-  select COMP in $( cut -f1 "components.txt" | grep -v "^#" ) ; do break; done
-fi
-
-# Gets package version from 'components.txt' file
-VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
-	
-# If no version is set in text file, get version number from source tarball name
-COMPNAME="${COMP##*/}"
-if [ -z "${VERSION}" ]; then
-  for d in "${TARBALLS_DIR}/main/${COMP%/*}" "${TARBALLS_DIR}/main/" "${PWD}/main/${COMP}/"; do
-    for n in "trinity-${COMPNAME}-${REQVERSION:-*}.tar.gz" "trinity-${COMPNAME}?-${REQVERSION:-*}.tar.gz" "trinity-${COMPNAME/kde/tde}-${REQVERSION:-*}.tar.gz"  "trinity-${COMPNAME/kde/tde}-${REQVERSION:-*}*.tar.gz"; do
-#      echo $d/$n
-      set $d/$n
-      if [ $# -eq 0 ]; then
-        echo "No tarball found !"
-        exit 1
-      elif [ $# -eq 1 ] && [ -r "$1" ]; then
-        TARBALL=$1
-      elif [ $# -gt 1 ]; then
-        select TARBALL in $*; do break; done
-      fi
-    done
-  done
-
-  echo "TARBALL is ${TARBALL##*/}"
-fi
-
-# Checks for version
-if [ -z "${VERSION}" ] && [ -n "${REQVERSION}" ]; then
-  VERSION="${REQVERSION}"
-fi
-
-# Checks for preversion (non-final)
-if [ "${TARBALL}" != "${TARBALL%%~pre*}" ]; then
-  PREVERSION="${TARBALL##*~}"
-  PREVERSION="${PREVERSION%.tar*}"
-fi
-	
-# Chooses a spec file (if many)
-set $( cd "${COMP}"; echo *${COMP##*/}*.spec )
-if [ $# -gt 1 ]; then
-	if [ -n "${REQVERSION}" ]; then
-		set $( cd "${COMP}"; echo *-${REQVERSION}.spec )
-		SPEC="$1"
-	else
-		select SPEC in $*; do break; done
-	fi
-elif [ -r "${COMP}/$1" ]; then
-	SPEC="$1"
-else
-	echo "Fatal: no spec file found !"
-	echo $1
-	exit 2
-fi
-	
-cat <<EOF
-
-About to build '${COMP}':
-  Version: '${VERSION}'
-  Preversion: '${PREVERSION}'
-  Spec file: '${SPEC}'
-  Tarball: '${TARBALL}'
-
-Press ENTER to build, or CTRL+C to abort.
-EOF
-[ -z "${AUTO}" ] && read rep
-	
-# Specific prefix for installation of some components
-case "${COMP##*/}" in
-	"qt3") PREFIX="/usr";;
-esac
-	
-# Determines if we are running an i386 or x86_64 distro
-if [ "$(rpm -q --qf '%{arch}\n' kernel | tail -n 1)" = "i686" ]; then
-	ARGS="${ARGS} --target=i686"
-fi
-
-LOGFILE=/tmp/log.${COMP##*/}
-
-SOURCEDIR="$(mktemp -d)"
-# Puts the GIT files in SOURCEDIR
-#rsync -rLv "${PWD}/${COMP}/" "${SOURCEDIR}/"
-while read a b; do
-  case "${a}" in
-    "Source"*|"Patch"*)
-      b=$(rpm -E "${b##*/}")
-      [ -r "${COMP}/${b}" ] && cp -fv "${COMP}/${b}" "${SOURCEDIR}"
-    ;;
-  esac
-done < "${COMP}/${SPEC}"
-
-# Copies the SPEC file
-cp -f "${COMP}/${SPEC}" "${SOURCEDIR}"
-
-# Puts the TARBALL in SOURCEDIR
-#cp -f "${TARBALLS_DIR}/${COMP}-"*.tar* "${SOURCEDIR}"
-echo "Copying TARBALL ..."
-cp -fv "${TARBALL}" "${SOURCEDIR}"
-
-BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)"
-BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)"
-
-TOPSRCRPMDIR="$(rpm -E %_srcrpmdir)"
-TOPRPMDIR="$(rpm -E %_rpmdir)"
-SUBDIR="${COMP%/*}"
-if [ "${SUBDIR}" = "${COMP}" ]; then
-	SUBDIR="main"
-fi
-RPMDIR="${TOPRPMDIR}/${SUBDIR}"
-SRCRPMDIR="${TOPSRCRPMDIR}/${SUBDIR}"
-
-[ -d "${BUILDDIR}" ] || mkdir "${BUILDDIR}"
-[ -d "${BUILDROOTDIR}" ] || mkdir "${BUILDROOTDIR}"
-
-set -x
-(
-rpmbuild -ba \
-	${ARGS} \
-	--define "_specdir ${SOURCEDIR}" \
-	--define "_sourcedir ${SOURCEDIR}" \
-	--define "_builddir ${BUILDDIR}" \
-	--define "_buildrootdir ${BUILDROOTDIR}" \
-	--define "tde_prefix ${PREFIX:-/opt/trinity}" \
-	--define "version ${VERSION:-3.5.13.2}" \
-	--define "preversion ${PREVERSION}" \
-	"${SOURCEDIR}/${SPEC}"
-	echo "RET=$?"
-) 2>&1 | tee ${LOGFILE}
-eval "$(grep ^RET= ${LOGFILE})"
-
-# Removes temporary source directory
-rm -rf "${SOURCEDIR}"
-
-if [ "${RET}" -gt 0 ]; then
-	exit ${RET}
-fi
-set +x
-
-if grep -q "error: Failed build dependencies:" ${LOGFILE}; then
-#	DEPS=$( sed -n -e "/.* is needed by .*/ s/^[ \t]*\([a-zA-Z2-9_-]*\) .*/\1/p" ${LOGFILE} )
-	set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 )
-	exit 2
-fi
-
-rm -rf "${SOURCEDIR}"
-
-# Removes BUILDDIR if build succeeded
-rm -rf "${BUILDDIR}/"*${COMP##*/}-${VERSION}*