From a38c7eaeb85bd7e23fa60cb4feae3eaba3b6cd21 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 27 Sep 2019 14:49:19 +0200
Subject: drop all php* and glpi* confusing repositories remi-modular is enough

---
 remi-glpi.repo    | 12 ------------
 remi-php.repo     | 34 ----------------------------------
 remi-release.spec | 22 ++++++++--------------
 3 files changed, 8 insertions(+), 60 deletions(-)
 delete mode 100644 remi-glpi.repo
 delete mode 100644 remi-php.repo

diff --git a/remi-glpi.repo b/remi-glpi.repo
deleted file mode 100644
index cbfdc41..0000000
--- a/remi-glpi.repo
+++ /dev/null
@@ -1,12 +0,0 @@
-# This repository only provides GLPI @DOTVER@ and its plugins
-# NOTICE: you need at least PHP @PHP@
-
-[remi-glpi@VER@]
-name=Remi's GLPI @DOTVER@ RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/glpi@VER@/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/glpi@VER@/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/glpi@VER@/$basearch/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
-
diff --git a/remi-php.repo b/remi-php.repo
deleted file mode 100644
index eb9dc41..0000000
--- a/remi-php.repo
+++ /dev/null
@@ -1,34 +0,0 @@
-# This repository only provides PHP @DOTVER@ and its extensions
-# NOTICE: common dependencies are in "remi-safe"
-
-[remi-php@VER@]
-name=Remi's PHP @DOTVER@ RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php@VER@/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php@VER@/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php@VER@/$basearch/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
-
-[remi-php@VER@-debuginfo]
-name=Remi's PHP @DOTVER@ RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php@VER@/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
-
-[remi-php@VER@-test]
-name=Remi's PHP @DOTVER@ test RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test@VER@/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test@VER@/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test@VER@/$basearch/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
-
-[remi-php@VER@-test-debuginfo]
-name=Remi's PHP @DOTVER@ test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test@VER@/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
diff --git a/remi-release.spec b/remi-release.spec
index 69c36d3..1a49ab5 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -9,7 +9,7 @@
 Name:           remi-release
 %if %{rhel} == 8
 Version:        8.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 %endif
 Summary:        YUM configuration for remi repository
 Summary(fr):    Configuration de YUM pour le dépôt remi
@@ -21,9 +21,7 @@ URL:            https://remirepo.net
 # Repository configuration files
 Source1:        remi.repo
 Source2:        remi-safe.repo
-Source3:        remi-glpi.repo
-Source4:        remi-php.repo
-Source5:        remi-modular.repo
+Source3:        remi-modular.repo
 
 # GPG Keys
 Source2000:     RPM-GPG-KEY-remi
@@ -67,18 +65,10 @@ Twitter: https://twitter.com/RemiRepository
 
 %prep
 %setup -c -T
-sed -e 's/@VER@/72/;s/@DOTVER@/7.2/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php72.repo
-sed -e 's/@VER@/73/;s/@DOTVER@/7.3/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php73.repo
-sed -e 's/@VER@/74/;s/@DOTVER@/7.4/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php74.repo
-
-sed -e 's/@PHP@/5.6/;s/@VER@/91/;s/@DOTVER@/9.1/;s/VERSION/%{rhel}/' %{SOURCE3} >remi-glpi91.repo
-sed -e 's/@PHP@/5.6/;s/@VER@/92/;s/@DOTVER@/9.2/;s/VERSION/%{rhel}/' %{SOURCE3} >remi-glpi92.repo
-sed -e 's/@PHP@/5.6/;s/@VER@/93/;s/@DOTVER@/9.3/;s/VERSION/%{rhel}/' %{SOURCE3} >remi-glpi93.repo
-sed -e 's/@PHP@/5.6/;s/@VER@/94/;s/@DOTVER@/9.4/;s/VERSION/%{rhel}/' %{SOURCE3} >remi-glpi94.repo
 
 sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo
 sed -e "s/VERSION/%{rhel}/" %{SOURCE2} | tee remi-safe.repo
-sed -e "s/VERSION/%{rhel}/" %{SOURCE5} | tee remi-modular.repo
+sed -e "s/VERSION/%{rhel}/" %{SOURCE3} | tee remi-modular.repo
 
 
 %build
@@ -96,7 +86,7 @@ install -Dp -m 644 %{SOURCE2019} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
 ln -s RPM-GPG-KEY-remi2018  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi.el8
 %endif
 
-# YUM
+# DNF
 for repo in *repo
 do
   install -Dp -m 644 $repo %{buildroot}%{_sysconfdir}/yum.repos.d/$repo
@@ -109,6 +99,10 @@ done
 
 
 %changelog
+* Fri Sep 27 2019 Remi Collet <remi@remirepo.net> - 8.0-4
+- drop all php* and glpi* confusing repositories
+  remi-modular is enough
+
 * Fri Sep  6 2019 Remi Collet <remi@remirepo.net> - 8.0-3
 - add php 7.4 repository
 - add link to the Wizard in package description
-- 
cgit