add debuginfo repo, switch failovermethod to roundrobin (for mirrors)

3 files changed, 31 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index 1e65467..de24a48 100644
--- a/Makefile
+++ b/Makefile
@@ -2,3 +2,9 @@ SRCDIR := $(shell pwd)
 NAME := $(shell basename $(SRCDIR))
 include ../common/Makefile
 
+el5:
+	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el5.spec --define 'dist .el5.remi' --define 'rhel 5'
+
+el6:
+	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el5.spec --define 'dist .el6.remi' --define 'rhel 6'
+
diff --git a/remi-el.repo b/remi-el.repo
index 943ec45..765483e 100644
--- a/remi-el.repo
+++ b/remi-el.repo
@@ -5,7 +5,6 @@ mirrorlist=http://rpms.famillecollet.com/enterprise/VERSION/remi/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-failovermethod=priority
 
 [remi-test]
 name=Les RPM de remi en test pour Enterprise Linux VERSION - $basearch
@@ -15,3 +14,17 @@ enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 
+[remi-debuginfo]
+name=Les RPM de remi pour Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.famillecollet.com/enterprise/VERSION/debug-remi/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+[remi-test-debuginfo]
+name=Les RPM de remi en test pour Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.famillecollet.com/enterprise/VERSION/debug-test/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
diff --git a/remi-release-el5.spec b/remi-release-el5.spec
index 3b1673c..d861530 100644
--- a/remi-release-el5.spec
+++ b/remi-release-el5.spec
@@ -1,18 +1,18 @@
 Name:           remi-release
 Version:        %{rhel}
 %if %{rhel} >= 6
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
-Release:        8%{?dist}
+Release:        9%{?dist}
 %endif
 Summary:        YUM configuration for remi repository
-Summary(fr):	Configuration de YUM pour le dépôt remi
+Summary(fr):    Configuration de YUM pour le dépôt remi
 
 Group:          System Environment/Base
 License:        GPL
 URL:            http://remi.collet.free.fr
 Source0:        RPM-GPG-KEY-remi
-Source1:	remi-el.repo
+Source1:        remi-el.repo
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArchitectures: noarch
 
@@ -20,6 +20,7 @@ Requires:       yum
 Requires:       redhat-release >= %{rhel}
 Requires:       epel-release >= %{rhel}
 
+
 %description
 This package contains yum configuration for the "remi" RPM Repository, 
 as well as the public GPG keys used to sign them.
@@ -36,16 +37,13 @@ l'option --enablerepo=remi de yum.
 
 %prep
 %setup -c -T
-%if 0%{?rhel} >= 5
-sed -e 's/VERSION/$releasever/' %{SOURCE1} | tee remi.repo
-%else
 sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo
-%endif
 
 
 %build
 echo empty build
 
+
 %install
 rm -rf %{buildroot}
 
@@ -55,6 +53,7 @@ rm -rf %{buildroot}
 # YUM
 %{__install} -Dp -m 644 remi.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
 
+
 %clean
 rm -rf %{buildroot}
 
@@ -64,6 +63,10 @@ rm -rf %{buildroot}
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
 
 %changelog
+* Tue Feb 12 2013 Remi Collet <RPMS@FamilleCollet.com> - 5-9 and 6-2
+- add debuginfo repo
+- drop failovermethod option (switch to roundrobin)
+
 * Sat Nov 13 2010 Remi Collet <RPMS@FamilleCollet.com> - 6-1.el6.remi
 - EL-6 rebuild