remi-release: php70 repo for Fedora

5 files changed, 35 insertions, 15 deletions

diff --git a/remi-fc.repo b/remi-fc.repo
index 44986b3..4958713 100644
--- a/remi-fc.repo
+++ b/remi-fc.repo
@@ -1,12 +1,12 @@
-# Repository: http://rpms.famillecollet.com/
-# Blog:       http://blog.famillecollet.com/
-# Forum:      http://forums.famillecollet.com/
+# Repository: http://rpms.remirepo.net/
+# Blog:       http://blog.remirepo.net/
+# Forum:      http://forum.remirepo.net/
 
 
 [remi]
-name=Les RPM de remi - Fedora $releasever - $basearch
-#baseurl=http://rpms.famillecollet.com/fedora/$releasever/remi/$basearch/
-mirrorlist=http://rpms.famillecollet.com/fedora/$releasever/remi/mirror
+name=Remi's RPM repository - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/remi/$basearch/
+mirrorlist=http://rpms.remirepo.net/fedora/$releasever/remi/mirror
 enabled=0
 gpgcheck=1
 failovermethod=roundrobin
diff --git a/remi-php56-fc.repo b/remi-php56-fc.repo
index 448542a..a6b4479 100644
--- a/remi-php56-fc.repo
+++ b/remi-php56-fc.repo
@@ -1,7 +1,7 @@
 [remi-php56]
-name=Les RPM de remi - PHP 5.6 - Fedora $releasever - $basearch
-#baseurl=http://rpms.famillecollet.com/fedora/$releasever/php56/$basearch/
-mirrorlist=http://rpms.famillecollet.com/fedora/$releasever/php56/mirror
+name=Remi's RPM repository - PHP 5.6 - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/php56/$basearch/
+mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php56/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1
diff --git a/remi-php70-fc.repo b/remi-php70-fc.repo
new file mode 100644
index 0000000..a6d0804
--- /dev/null
+++ b/remi-php70-fc.repo
@@ -0,0 +1,10 @@
+[remi-php70]
+name=Remi's RPM repository - PHP 7.0 - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/php70/$basearch/
+mirrorlist=http://rpms.remirepo.net/fedora/$releasever/php70/mirror
+# WARNING: If you enable this repository, you must also enable "remi"
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
diff --git a/remi-release.spec b/remi-release.spec
index 7ba10a5..e23b03c 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -1,7 +1,7 @@
 Name:           remi-release
 Version:        %{fedora}
 %if %{fedora} >= 21
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
 %if %{fedora} >= 18
 Release:        3%{?dist}
@@ -14,17 +14,20 @@ Summary(fr):	Configuration de YUM pour le dépôt remi
 
 Group:          System Environment/Base
 License:        GPLv2+
-URL:            http://rpms.famillecollet.com/
+URL:            http://rpms.remirepo.net/
 Source0:        RPM-GPG-KEY-remi
 Source1:        remi-fc.repo
 Source2:        remi-test-fc.repo
 Source3:        remi-php56-fc.repo
+Source4:        remi-php70-fc.repo
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}
 BuildArchitectures: noarch
 
 %if %{fedora} < 21
 Requires:       yum
+%else
+Requires:       /etc/yum.repos.d
 %endif
 Requires:       fedora-release >= %{fedora}
 
@@ -61,9 +64,12 @@ install -Dp -m 644 %{SOURCE0} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
 # YUM
 install -Dp -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/remi.repo
 install -Dp -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-test.repo
-%if %{fedora} < 21
+%if %{fedora} >= 19 && %{fedora} <= 20
 install -Dp -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php56.repo
 %endif
+%if %{fedora} >= 21 && %{fedora} <= 22
+install -Dp -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php70.repo
+%endif
 
 
 %clean
@@ -77,6 +83,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jul 23 2015 Remi Collet <remi@remirepo.net> - ##-2.fc##.remi
+- add php70 repository
+- update repository configuration for new "remirepo.net" domain
+
 * Fri Feb 27 2015 Remi Collet <RPMS@FamilleCollet.com> - 22-1.fc22.remi
 - Fedora release 22
 
diff --git a/remi-test-fc.repo b/remi-test-fc.repo
index 927a1ee..bfd9013 100644
--- a/remi-test-fc.repo
+++ b/remi-test-fc.repo
@@ -1,7 +1,7 @@
 [remi-test]
-name=Les RPM de remi - Testing - Fedora $releasever - $basearch
-#baseurl=http://rpms.famillecollet.com/fedora/$releasever/test/$basearch/
-mirrorlist=http://rpms.famillecollet.com/fedora/$releasever/test/mirror
+name=Remi's RPM repository - Testing - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/test/$basearch/
+mirrorlist=http://rpms.remirepo.net/fedora/$releasever/test/mirror
 # WARNING: If you enable this repository, you must also enable "remi"
 enabled=0
 gpgcheck=1