add GLPI dedicated repostitories

add symlink to have a key per version and allow system upgrade

11 files changed, 69 insertions, 27 deletions

diff --git a/remi-debug.repo b/remi-debug.repo
index c8e1792..6871378 100644
--- a/remi-debug.repo
+++ b/remi-debug.repo
@@ -3,40 +3,40 @@ name=Remi's RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-remi/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
 [remi-test-debuginfo]
 name=Remi's test RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
 [remi-php70-debuginfo]
 name=Remi's PHP 7.0 RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php70/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
 [remi-php70-test-debuginfo]
 name=Remi's PHP 7.0 test RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test70/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
 [remi-php71-debuginfo]
 name=Remi's PHP 7.1 RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php71/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
 [remi-php71-test-debuginfo]
 name=Remi's PHP 7.1 test RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test71/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
diff --git a/remi-glpi91.repo b/remi-glpi91.repo
new file mode 100644
index 0000000..44eacca
--- /dev/null
+++ b/remi-glpi91.repo
@@ -0,0 +1,10 @@
+[remi-glpi91]
+name=Remi's RPM repository - GLPI 9.1 - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/glpi91/$basearch/
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/glpi91/mirror
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
diff --git a/remi-glpi92.repo b/remi-glpi92.repo
new file mode 100644
index 0000000..d21e140
--- /dev/null
+++ b/remi-glpi92.repo
@@ -0,0 +1,10 @@
+[remi-glpi92]
+name=Remi's RPM repository - GLPI 9.2 - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/glpi92/$basearch/
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/glpi92/mirror
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
diff --git a/remi-glpi93.repo b/remi-glpi93.repo
new file mode 100644
index 0000000..ea62f60
--- /dev/null
+++ b/remi-glpi93.repo
@@ -0,0 +1,10 @@
+[remi-glpi93]
+name=Remi's RPM repository - GLPI 9.3 - Fedora $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/fedora/$releasever/glpi93/$basearch/
+mirrorlist=http://cdn.remirepo.net/fedora/$releasever/glpi93/mirror
+enabled=0
+gpgcheck=1
+failovermethod=roundrobin
+fastestmirror=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
+
diff --git a/remi-php71-test.repo b/remi-php71-test.repo
index a45c38b..b82d813 100644
--- a/remi-php71-test.repo
+++ b/remi-php71-test.repo
@@ -7,4 +7,4 @@ enabled=0
 gpgcheck=1
 failovermethod=roundrobin
 fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
diff --git a/remi-php71.repo b/remi-php71.repo
index a9c7d0b..6153982 100644
--- a/remi-php71.repo
+++ b/remi-php71.repo
@@ -7,4 +7,4 @@ enabled=0
 gpgcheck=1
 failovermethod=roundrobin
 fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
diff --git a/remi-php72-test.repo b/remi-php72-test.repo
index 3336f5d..ccd5483 100644
--- a/remi-php72-test.repo
+++ b/remi-php72-test.repo
@@ -7,12 +7,12 @@ enabled=0
 gpgcheck=1
 failovermethod=roundrobin
 fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
 [remi-php72-test-debuginfo]
 name=Remi's PHP 7.2 test RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-test72/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
diff --git a/remi-php72.repo b/remi-php72.repo
index b7c2d30..e722376 100644
--- a/remi-php72.repo
+++ b/remi-php72.repo
@@ -7,12 +7,12 @@ enabled=0
 gpgcheck=1
 failovermethod=roundrobin
 fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
 [remi-php72-debuginfo]
 name=Remi's PHP 7.2 RPM repository for Fedora $releasever - $basearch - debuginfo
 baseurl=http://rpms.remirepo.net/fedora/$releasever/debug-php72/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
 
diff --git a/remi-release.spec b/remi-release.spec
index b71bb33..efa9034 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -11,10 +11,10 @@
 Name:           remi-release
 Version:        %{fedora}
 %if %{fedora} == 28
-Release:        1%{?dist}
+Release:        2%{?dist}
 %endif
 %if %{fedora} == 27
-Release:        2%{?dist}
+Release:        3%{?dist}
 %endif
 %if %{fedora} == 26
 Release:        3%{?dist}
@@ -37,6 +37,9 @@ Source7:        remi-php71-test.repo
 Source8:        remi-debug.repo
 Source10:       remi-php72.repo
 Source11:       remi-php72-test.repo
+Source20:       remi-glpi91.repo
+Source21:       remi-glpi92.repo
+Source22:       remi-glpi93.repo
 
 # GPG keys
 Source2000:     RPM-GPG-KEY-remi
@@ -102,6 +105,19 @@ install -Dp -m 644 %{SOURCE2000} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
 install -Dp -m 644 %{SOURCE2017} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2017
 install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2018
 
+%if %{fedora} <= 29
+ln -s RPM-GPG-KEY-remi2018  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-29
+%endif
+%if %{fedora} <= 28
+ln -s RPM-GPG-KEY-remi2018  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-28
+%endif
+%if %{fedora} <= 27
+ln -s RPM-GPG-KEY-remi2017  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-27
+%endif
+%if %{fedora} <= 26
+ln -s RPM-GPG-KEY-remi2017  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-26
+%endif
+
 # 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
@@ -116,17 +132,9 @@ install -Dp -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php72
 %if %{fedora} >= 23
 install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debuginfo.repo
 %endif
-
-%if %{fedora} >= 28
-: Use new GPG Key
-sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2018/' \
-    -i %{buildroot}%{_sysconfdir}/yum.repos.d/*repo
-%endif
-%if %{fedora} >= 26 && %{fedora} <= 27
-: Use new GPG Key
-sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2017/' \
-    -i %{buildroot}%{_sysconfdir}/yum.repos.d/*repo
-%endif
+install -Dp -m 644 %{SOURCE20} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi91.repo
+install -Dp -m 644 %{SOURCE21} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi92.repo
+install -Dp -m 644 %{SOURCE22} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-glpi93.repo
 
 
 %files
@@ -135,6 +143,10 @@ sed -e 's/RPM-GPG-KEY-remi/RPM-GPG-KEY-remi2017/' \
 
 
 %changelog
+* Tue Jun  5 2018 Remi Collet <remi@remirepo.net> - 27-3 and 28-2
+- add GLPI dedicated repostitories
+- add symlink to have a key per version and allow system upgrade
+
 * Mon Feb 26 2018 Remi Collet <remi@remirepo.net> - 28-1
 - Fedora release 28
 - fix package License (CC-BY-SA)
diff --git a/remi-test.repo b/remi-test.repo
index e150f45..3887071 100644
--- a/remi-test.repo
+++ b/remi-test.repo
@@ -7,4 +7,4 @@ enabled=0
 gpgcheck=1
 failovermethod=roundrobin
 fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever
diff --git a/remi.repo b/remi.repo
index 80d269f..683f83f 100644
--- a/remi.repo
+++ b/remi.repo
@@ -11,4 +11,4 @@ enabled=0
 gpgcheck=1
 failovermethod=roundrobin
 fastestmirror=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi-$releasever