summaryrefslogtreecommitdiffstats
path: root/redhat/extras/trinity-desktop
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/extras/trinity-desktop')
-rw-r--r--redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo2
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec26
2 files changed, 22 insertions, 6 deletions
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 e54847b54..daae84e79 100644
--- a/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
+++ b/redhat/extras/trinity-desktop/trinity-3.5.13-rhel.repo
@@ -11,7 +11,7 @@ enabled=1
gpgcheck=0
[trinity-3.5.13-rhel-source]
-name=trinity-3.5.13-f16-source
+name=trinity-3.5.13-rhel-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
enabled=1
gpgcheck=0
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index 1820928c9..761e05e75 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
-%define release 2
+%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -105,12 +105,25 @@ Summary: Yum configuration files for Trinity
%install
%__rm -rf %{?buildroot}
%__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d
-%if 0%{?fedora}
-%__install -m 644 %{SOURCE0} %{?buildroot}%{_sysconfdir}/yum.repos.d
-%else
-%__install -m 644 %{SOURCE1} %{?buildroot}%{_sysconfdir}/yum.repos.d
+
+# Fedora repo file
+%if 0%{?fedora} > 0
+%__sed %{SOURCE0} \
+ -e 's/\$releasever/%{fedora}/g' \
+ -e 's/-fedora/-f%{fedora}/g' \
+ >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-f%{fedora}.repo
+%endif
+
+# RHEL repo file
+%if 0%{?rhel} > 0
+%__sed %{SOURCE1} \
+ -e 's/\$releasever/%{rhel}/g' \
+ -e 's/-rhel/-el%{rhel}/g' \
+ >%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13-el%{rhel}.repo
%endif
+%__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo
+
%files
%files dev
@@ -123,5 +136,8 @@ Summary: Yum configuration files for Trinity
%{_sysconfdir}/yum.repos.d/*.repo
%changelog
+* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
+- Fix repo files name and content
+
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add 'repo' package