remi-release-7.1-1.el7

3 files changed, 80 insertions, 32 deletions

diff --git a/remi-el.repo b/remi-el.repo
index 716d8ee..27fe27d 100644
--- a/remi-el.repo
+++ b/remi-el.repo
@@ -1,62 +1,62 @@
 [remi]
-name=Les RPM de remi pour Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.famillecollet.com/enterprise/VERSION/remi/$basearch/
-mirrorlist=http://rpms.famillecollet.com/enterprise/VERSION/remi/mirror
+name=Remi's RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/remi/$basearch/
+mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/remi/mirror
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 
 [remi-php55]
-name=Les RPM de remi de PHP 5.5 pour Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.famillecollet.com/enterprise/VERSION/php55/$basearch/
-mirrorlist=http://rpms.famillecollet.com/enterprise/VERSION/php55/mirror
+name=Remi's PHP 5.5 RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php55/$basearch/
+mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php55/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 
 [remi-php56]
-name=Les RPM de remi de PHP 5.6 pour Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.famillecollet.com/enterprise/VERSION/php56/$basearch/
-mirrorlist=http://rpms.famillecollet.com/enterprise/VERSION/php56/mirror
+name=Remi's PHP 5.6 RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php56/$basearch/
+mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/php56/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 
 [remi-test]
-name=Les RPM de remi en test pour Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.famillecollet.com/enterprise/VERSION/test/$basearch/
-mirrorlist=http://rpms.famillecollet.com/enterprise/VERSION/test/mirror
+name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test/$basearch/
+mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 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/
+name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 
 [remi-php55-debuginfo]
-name=Les RPM de remi de PHP 5.5 pour Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.famillecollet.com/enterprise/VERSION/debug-php55/$basearch/
+name=Remi's PHP 5.5 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php55/$basearch/
 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/
+name=Remi's PHP 5.6 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/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/
+name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-release-el.spec b/remi-release-el.spec
index 78829c0..ed4375a 100644
--- a/remi-release-el.spec
+++ b/remi-release-el.spec
@@ -1,6 +1,6 @@
 Name:           remi-release
 %if %{rhel} == 7
-Version:        7.0
+Version:        7.1
 Release:        1%{?dist}
 %endif
 %if %{rhel} == 6
@@ -16,9 +16,11 @@ Summary(fr):    Configuration de YUM pour le dépôt remi
 
 Group:          System Environment/Base
 License:        GPL
-URL:            http://remi.collet.free.fr
+URL:            http://remirepo.net
 Source0:        RPM-GPG-KEY-remi
 Source1:        remi-el.repo
+Source2:        remi-safe.repo
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArchitectures: noarch
 
@@ -28,23 +30,48 @@ Requires:       epel-release >= %{rhel}
 
 
 %description
-This package contains yum configuration for the "remi" RPM Repository, 
+This package contains yum configuration for the Remi's 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.
+%if %{rhel} == 7
+Only the "remi-safe" repository is enabled after installation.
+%else
+The repository is not enabled after installation.
+%endif
+For PHP 5.4 you must use --enablerepo=remi yum option.
+For PHP 5.5 you must use --enablerepo=remi,remi-php55 yum option.
+For PHP 5.6 you must use --enablerepo=remi,remi-php56 yum option.
+%if %{rhel} >= 6
+Software Collections are in the main "remi" repository.
+%endif
+FAQ:   http://blog.remirepo.net/pages/English-FAQ
+Forum: http://forum.remirepo.net/
 
 %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.
+les RPM du dépôt de Remi ainsi que la clé GPG utilisée pour les signer.
+%if %{rhel} == 7
+Seul le dépôt "remi-safe" est activé après l'installation.
+%else
+Le dépôt n'est pas activé après l'installation.
+%endif
+Pour PHP 5.4 vous devez utiliser l'option --enablerepo=remi
+Pour PHP 5.5 vous devez utiliser l'option --enablerepo=remi,remi-php55
+Pour PHP 5.5 vous devez utiliser l'option --enablerepo=remi,remi-php56
+%if %{rhel} >= 6
+Les "Software Collections" sont dans le dépôt principal "remi".
+%endif
+FAQ:   http://blog.remirepo.net/pages/FAQ-en-Francais
+Forum: http://forum.remirepo.net/
 
-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
 
+%if %{rhel} == 7
+sed -e "s/VERSION/%{rhel}/" %{SOURCE2} | tee remi-safe.repo
+%endif
+
 
 %build
 echo empty build
@@ -54,21 +81,31 @@ echo empty build
 rm -rf %{buildroot}
 
 # PGP
-%{__install} -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
+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
+for repo in *repo
+do
+  install -Dp -m 644 $repo %{buildroot}%{_sysconfdir}/yum.repos.d/$repo
+done
 
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/yum.repos.d/remi.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/remi*repo
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi
 
+
 %changelog
+* Tue Jun  2 2015 Remi Collet <remmi@remirepo.net> - 7.1-1
+- add remi-safe repository
+- translate repository name
+- update repository configuration for "remirepo.net" domain
+
 * Thu Apr 24 2014 Remi Collet <RPMS@FamilleCollet.com> - 7.0-1
 - EL-7 build
 
diff --git a/remi-safe.repo b/remi-safe.repo
new file mode 100644
index 0000000..b997e3c
--- /dev/null
+++ b/remi-safe.repo
@@ -0,0 +1,11 @@
+# This repository is safe to use with RHEL/CentOS base repository
+# it only provides additional packages for the PHP stack
+# all dependencies are in base repository or in EPEL
+
+[remi-safe]
+name=Safe Remi's RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/safe/$basearch/
+mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/safe/mirror
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi