new 'remi-php70-test' repository (EL 6, 7 and x86_64 only)

3 files changed, 46 insertions, 18 deletions

diff --git a/remi-el.repo b/remi-el.repo
index 75d162f..f7740b1 100644
--- a/remi-el.repo
+++ b/remi-el.repo
@@ -14,7 +14,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 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"
+# NOTICE: common dependencies are in "remi-safe"
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
@@ -23,7 +23,7 @@ gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
 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"
+# NOTICE: common dependencies are in "remi-safe"
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-php70.repo b/remi-php70.repo
index e8ad1aa..10e566f 100644
--- a/remi-php70.repo
+++ b/remi-php70.repo
@@ -1,6 +1,5 @@
 # This repository only provides PHP 7.0 and its extensions
-# WARNING: If you enable this repository, you must also enable "remi"
-#          which provides common dependencies
+# NOTICE: common dependencies are in "remi-safe"
 
 [remi-php70]
 name=Remi's PHP 7.0 RPM repository for Enterprise Linux VERSION - $basearch
@@ -16,3 +15,18 @@ baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php70/$basearch/
 enabled=0
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+[remi-php70-test]
+name=Remi's PHP 7.0 test RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test70/$basearch/
+mirrorlist=http://rpms.remirepo.net/enterprise/VERSION/test70/mirror
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+
+[remi-php70-test-debuginfo]
+name=Remi's PHP 7.0 test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test70/$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 1e4d93d..4373fd9 100644
--- a/remi-release-el.spec
+++ b/remi-release-el.spec
@@ -1,11 +1,11 @@
 Name:           remi-release
 %if %{rhel} == 7
 Version:        7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 %endif
 %if %{rhel} == 6
 Version:        6.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 %if %{rhel} == 5
 Version:        5.10
@@ -33,17 +33,22 @@ Requires:       epel-release >= %{rhel}
 %description
 This package contains yum configuration for the Remi's RPM Repository,
 as well as the public GPG keys used to sign them.
-%if %{rhel} == 7
+%if %{rhel} >= 6
 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.
-For PHP 7.0 you must use --enablerepo=remi,remi-php70 yum option.
+For PHP 5.5 you must use enable remi-php55 repository:
+    yum-config-manager --enable remi-php55
+
+For PHP 5.6 you must use enable remi-php56 repository:
+    yum-config-manager --enable remi-php56
+
+For PHP 7.0 you must use enable remi-php70 repository:
+    yum-config-manager --enable remi-php70
+
 %if %{rhel} >= 6
-Software Collections are in the main "remi" repository.
+Software Collections are in the "remi-safe" repository.
 %endif
 FAQ:   http://blog.remirepo.net/pages/English-FAQ
 Forum: http://forum.remirepo.net/
@@ -51,17 +56,22 @@ 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 de Remi ainsi que la clé GPG utilisée pour les signer.
-%if %{rhel} == 7
+%if %{rhel} >= 6
 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.6 vous devez utiliser l'option --enablerepo=remi,remi-php56
-Pour PHP 7.0 vous devez utiliser l'option --enablerepo=remi,remi-php70
+Pour PHP 5.5 vous devez activer le dépôt remi-php55
+    yum-config-manager --enable remi-php55
+
+Pour PHP 5.6 vous devez activer le dépôt remi-php56
+    yum-config-manager --enable remi-php56
+
+Pour PHP 7.0 vous devez activer le dépôt remi-php70
+    yum-config-manager --enable remi-php70
+
 %if %{rhel} >= 6
-Les "Software Collections" sont dans le dépôt principal "remi".
+Les "Software Collections" sont dans le dépôt "remi-safe".
 %endif
 FAQ:   http://blog.remirepo.net/pages/FAQ-en-Francais
 Forum: http://forum.remirepo.net/
@@ -105,6 +115,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec  9 2015 Remi Collet <remmi@remirepo.net> - 6.6-2 and 7.1-3
+- add remi-php70-test repository
+- fix information, remi is not more required by remi-phpxx
+
 * Fri Jul 24 2015 Remi Collet <remmi@remirepo.net> - 6.6-1
 - add remi-safe repository