remi-release: cleanups

5 files changed, 116 insertions, 4 deletions

diff --git a/Makefile b/Makefile
index 5063992..54d0c5b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,11 +3,13 @@ NAME := $(shell basename $(SRCDIR))
 include ../common/Makefile
 
 el5:
-	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el5.spec --define 'dist .el5.remi' --define 'rhel 5'
+	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el5.remi' --define 'rhel 5'
 
 el6:
-	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el5.spec --define 'dist .el6.remi' --define 'rhel 6'
+	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el6.remi' --define 'rhel 6'
 
 f20:
 	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f20.remi' --define 'fedora 20'
 
+f19:
+	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f19.remi' --define 'fedora 19'
diff --git a/remi-el.repo b/remi-el.repo
index 3c14fdc..716d8ee 100644
--- a/remi-el.repo
+++ b/remi-el.repo
@@ -47,6 +47,13 @@ enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 
+[remi-php56-debuginfo]
+name=Les RPM de remi de PHP 5.6 pour Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.famillecollet.com/enterprise/VERSION/debug-php56/$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/
diff --git a/remi-fc.repo b/remi-fc.repo
index 26e9baf..0c4fc52 100644
--- a/remi-fc.repo
+++ b/remi-fc.repo
@@ -25,7 +25,7 @@ gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 
 [remi-dev]
-name=Les RPM experimentaux de remi en test pour Fedora $releasever - $basearch
+name=Les RPM experimentaux de remi pour Fedora $releasever - $basearch
 baseurl=http://rpms.famillecollet.com/fedora/$releasever/devs/$basearch/
 enabled=0
 gpgcheck=1
diff --git a/remi-release-el.spec b/remi-release-el.spec
new file mode 100644
index 0000000..f43647c
--- /dev/null
+++ b/remi-release-el.spec
@@ -0,0 +1,103 @@
+Name:           remi-release
+%if %{rhel} >= 6
+Version:        6.5
+Release:        1%{?dist}
+%else
+Version:        5.10
+Release:        1%{?dist}
+%endif
+Summary:        YUM configuration for remi repository
+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
+BuildRoot:      %{_tmppath}/%{name}-%{version}
+BuildArchitectures: noarch
+
+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.
+
+The repository is not enabled after installation, so you must use
+the --enablerepo=remi option for yum.
+
+%description -l fr
+Ce paquetage contient le fichier de configuration de YUM pour utiliser
+les RPM du dépôt "remi" ainsi que la clé GPG utilisée pour les signer.
+
+Le dépôt n'est pas activé après l'installation, vous devez donc utiliser
+l'option --enablerepo=remi de yum.
+
+%prep
+%setup -c -T
+sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo
+
+
+%build
+echo empty build
+
+
+%install
+rm -rf %{buildroot}
+
+# PGP
+%{__install} -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+# YUM
+%{__install} -Dp -m 644 remi.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
+
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/yum.repos.d/remi.repo
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+%changelog
+* Fri Feb 28 2014 Remi Collet <RPMS@FamilleCollet.com> - 5.10-1 and 6.5-1
+- add php56 repository
+
+* Thu Oct  3 2013 Remi Collet <RPMS@FamilleCollet.com> - 5.9-1 and 6.4-1
+- add php55 repository
+
+* 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
+
+* Sat May 01 2010 Remi Collet <RPMS@FamilleCollet.com> - 5-8.el5.remi
+- use a mirrorlist URL
+
+* Sun May 03 2009 Remi Collet <RPMS@FamilleCollet.com> - 5-7.el5.remi
+- new repo layout
+
+* Thu Jan 22 2009 Remi Collet <RPMS@FamilleCollet.com> - 5-6.el5.remi
+- fix bad $releasever in remi.repo (5Server doesn't work)
+
+* Tue Jan 20 2009 Remi Collet <RPMS@FamilleCollet.com> - 5-5.el5.remi
+- remove free.fr mirror
+
+* Sat Feb  2 2008 Remi Collet <RPMS@FamilleCollet.com> - 5-4.el5.remi
+- new mirror http://rpms.famillecollet.com/
+
+* Sat Nov 17 2007 Remi Collet <RPMS@FamilleCollet.com> - 5-3.el5.remi
+- add requires epel-release
+
+* Sun Jun 24 2007 Remi Collet <RPMS@FamilleCollet.com> - 5-2.el5.remi
+- New key (email change, same ID)
+
+* Sat May 26 2007 Remi Collet <RPMS@FamilleCollet.com> - 5-1.el5.remi
+- EL-5 rebuild
+
diff --git a/remi-release.spec b/remi-release.spec
index fccccfe..014b1ca 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -129,7 +129,7 @@ rm -rf %{buildroot}
 * Sat Feb  2 2008 Remi Collet <RPMS@FamilleCollet.com> - {3-8}-4.fc{3-8}.remi
 - new mirror http://rpms.famillecollet.com/
 
-* Thu Nov 02 2007 Remi Collet <RPMS@FamilleCollet.com> - 8-3.fc8.remi
+* Fri Nov 02 2007 Remi Collet <RPMS@FamilleCollet.com> - 8-3.fc8.remi
 - F8 build
 
 * Thu Aug 23 2007 Remi Collet <RPMS@FamilleCollet.com> - {3-5}-3.fc{3-5}.remi