From 978fb1ca277644af213a2bcf84387c374004756f Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Fri, 15 Jan 2016 09:59:35 +0100
Subject: add "remi-php70-test" repository for fedora

---
 remi-php70-test-fc.repo | 10 ++++++++++
 remi-release-el.spec    | 14 +++++++++++---
 remi-release.spec       | 37 +++++++++++++++++++++++++------------
 3 files changed, 46 insertions(+), 15 deletions(-)
 create mode 100644 remi-php70-test-fc.repo

diff --git a/remi-php70-test-fc.repo b/remi-php70-test-fc.repo
new file mode 100644
index 0000000..4bf2f2c
--- /dev/null
+++ b/remi-php70-test-fc.repo
@@ -0,0 +1,10 @@
+[remi-php70-test]
+name=Remi's RPM repository - Testing - PHP 7.0 - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/test70/$basearch/
+mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test70/mirror
+# WARNING: If you enable this repository, you must also enable "remi" and "remi-php70"
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-release-el.spec b/remi-release-el.spec
index 4373fd9..bc7236d 100644
--- a/remi-release-el.spec
+++ b/remi-release-el.spec
@@ -1,3 +1,11 @@
+# remirepo spec file for remi-release (RHEL, CentOS)
+#
+# Copyright (c) 2006-2016 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
 Name:           remi-release
 %if %{rhel} == 7
 Version:        7.1
@@ -38,13 +46,13 @@ Only the "remi-safe" repository is enabled after installation.
 %else
 The repository is not enabled after installation.
 %endif
-For PHP 5.5 you must use enable remi-php55 repository:
+For PHP 5.5 you must enable the remi-php55 repository:
     yum-config-manager --enable remi-php55
 
-For PHP 5.6 you must use enable remi-php56 repository:
+For PHP 5.6 you must enable the remi-php56 repository:
     yum-config-manager --enable remi-php56
 
-For PHP 7.0 you must use enable remi-php70 repository:
+For PHP 7.0 you must enable the remi-php70 repository:
     yum-config-manager --enable remi-php70
 
 %if %{rhel} >= 6
diff --git a/remi-release.spec b/remi-release.spec
index 40da38e..bc0b747 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -1,18 +1,14 @@
+# remirepo spec file for remi-release (Fedora)
+#
+# Copyright (c) 2006-2016 Remi Collet
+# License: CC-BY-SA
+# http://creativecommons.org/licenses/by-sa/4.0/
+#
+# Please, preserve the changelog entries
+#
 Name:           remi-release
 Version:        %{fedora}
-%if %{fedora} >= 23
-Release:        1%{?dist}
-%else
-%if %{fedora} >= 21
-Release:        2%{?dist}
-%else
-%if %{fedora} >= 18
 Release:        3%{?dist}
-%else
-Release:        7%{?dist}
-%endif
-%endif
-%endif
 Summary:        YUM configuration for remi repository
 Summary(fr):	Configuration de YUM pour le dépôt remi
 
@@ -24,6 +20,7 @@ Source1:        remi-fc.repo
 Source2:        remi-test-fc.repo
 Source3:        remi-php56-fc.repo
 Source4:        remi-php70-fc.repo
+Source5:        remi-php70-test-fc.repo
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArchitectures: noarch
@@ -42,6 +39,12 @@ 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 %{fedora} >= 21 && %{fedora} <= 23
+For PHP 7.0 you must enable the remi-php70 repository:
+    dnf config-manager --enable remi-php70
+%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
@@ -49,6 +52,12 @@ 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.
+%if %{fedora} >= 21 && %{fedora} <= 23
+Pour PHP 7.0 vous devez activer le dépôt remi-php70
+    dnf config-manager --enable remi-php70
+%endif
+FAQ:   http://blog.remirepo.net/pages/FAQ-en-Francais
+Forum: http://forum.remirepo.net/
 
 
 %prep
@@ -73,6 +82,7 @@ install -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php56.
 %endif
 %if %{fedora} >= 21 && %{fedora} <= 23
 install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php70.repo
+install -Dp -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php70-test.repo
 %endif
 
 
@@ -87,6 +97,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 15 2016 Remi Collet <remi@remirepo.net> - %{fedora}-3.fc%{fedora}.remi
+- add remi-php70-test repository
+
 * Fri Aug 28 2015 Remi Collet <RPMS@FamilleCollet.com> - 23-1.fc23.remi
 - Fedora release 23
 
-- 
cgit