From 10d8be91c9ba6a6360c6ac9ee818408c42c0663b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 6 Nov 2015 22:58:52 +0100
Subject: RPM packaging: updates dependencies for 14.0.2

---
 redhat/extras/trinity-desktop/trinity-3.5.13-fedora.repo  | 12 ++++++------
 redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo    | 12 ++++++------
 redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec | 10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'redhat/extras')

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
-- 
cgit v1.2.3