summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile7
-rw-r--r--remi-el.repo71
-rw-r--r--remi-glpi.repo6
-rw-r--r--remi-php.repo16
-rw-r--r--remi-php54.repo12
-rw-r--r--remi-release.spec (renamed from remi-release-el.spec)42
-rw-r--r--remi-safe.repo8
-rw-r--r--remi.repo37
8 files changed, 66 insertions, 133 deletions
diff --git a/Makefile b/Makefile
index dfeb4d9..57c9f9b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,6 @@ SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
include ../common/Makefile
-el6:
- rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el6.remi' --define 'rhel 6'
-
-el7:
- rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME)-el.spec --define 'dist .el7.remi' --define 'rhel 7'
+el8:
+ rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .el8.remi' --define 'rhel 8'
diff --git a/remi-el.repo b/remi-el.repo
deleted file mode 100644
index a847e01..0000000
--- a/remi-el.repo
+++ /dev/null
@@ -1,71 +0,0 @@
-# Repository: http://rpms.remirepo.net/
-# Blog: http://blog.remirepo.net/
-# Forum: http://forum.remirepo.net/
-
-[remi]
-name=Remi's RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/remi/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/remi/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/remi/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php55]
-name=Remi's PHP 5.5 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php55/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php55/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php55/mirror
-# NOTICE: common dependencies are in "remi-safe"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php56]
-name=Remi's PHP 5.6 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php56/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php56/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php56/mirror
-# NOTICE: common dependencies are in "remi-safe"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-test]
-name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test/mirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test/mirror
-# WARNING: If you enable this repository, you must also enable "remi"
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-debuginfo]
-name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php55-debuginfo]
-name=Remi's PHP 5.5 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php55/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-php56-debuginfo]
-name=Remi's PHP 5.6 RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-php56/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
-[remi-test-debuginfo]
-name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
diff --git a/remi-glpi.repo b/remi-glpi.repo
index 550966d..cbfdc41 100644
--- a/remi-glpi.repo
+++ b/remi-glpi.repo
@@ -4,9 +4,9 @@
[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@/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/glpi@VER@/mirror
+#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
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
diff --git a/remi-php.repo b/remi-php.repo
index bf2eb69..eb9dc41 100644
--- a/remi-php.repo
+++ b/remi-php.repo
@@ -4,31 +4,31 @@
[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@/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php@VER@/mirror
+#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
+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
+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@/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test@VER@/mirror
+#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
+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
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
diff --git a/remi-php54.repo b/remi-php54.repo
deleted file mode 100644
index 9927a06..0000000
--- a/remi-php54.repo
+++ /dev/null
@@ -1,12 +0,0 @@
-# This repository only provides PHP 5.4 and its extensions
-# NOTICE: common dependencies are in "remi-safe"
-
-[remi-php54]
-name=Remi's PHP 5.4 RPM repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/php54/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/php54/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/php54/mirror
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
-
diff --git a/remi-release-el.spec b/remi-release.spec
index 5db35e8..011a15c 100644
--- a/remi-release-el.spec
+++ b/remi-release.spec
@@ -7,13 +7,9 @@
# Please, preserve the changelog entries
#
Name: remi-release
-%if %{rhel} == 7
-Version: 7.5
-Release: 2%{?dist}
-%endif
-%if %{rhel} == 6
-Version: 6.9
-Release: 4%{?dist}
+%if %{rhel} == 8
+Version: 8.0
+Release: 1%{?dist}
%endif
Summary: YUM configuration for remi repository
Summary(fr): Configuration de YUM pour le dépôt remi
@@ -23,11 +19,10 @@ License: CC-BY-SA
URL: https://remirepo.net
# Repository configuration files
-Source1: remi-el.repo
+Source1: remi.repo
Source2: remi-safe.repo
Source3: remi-glpi.repo
Source4: remi-php.repo
-Source5: remi-php54.repo
# GPG Keys
Source2000: RPM-GPG-KEY-remi
@@ -40,7 +35,7 @@ BuildArchitectures: noarch
# Sadly system-release and redhat-release are not versionned
Requires: redhat-release
-Requires: epel-release = %{rhel}
+Recommends: epel-release = %{rhel}
# Ensure not installable on Fedora
Conflicts: fedora-release
@@ -57,15 +52,6 @@ For PHP 7.3 you must enable the remi-php73 repository:
For PHP 7.2 you must enable the remi-php72 repository:
yum-config-manager --enable remi-php72
-For PHP 7.1 you must enable the remi-php71 repository:
- yum-config-manager --enable remi-php71
-
-For PHP 7.0 you must enable the remi-php70 repository:
- yum-config-manager --enable remi-php70
-
-For PHP 5.6 you must enable the remi-php56 repository:
- yum-config-manager --enable remi-php56
-
Software Collections are in the "remi-safe" repository.
FAQ: https://blog.remirepo.net/pages/English-FAQ
@@ -84,15 +70,6 @@ Pour PHP 7.3 vous devez activer le dépôt remi-php73
Pour PHP 7.2 vous devez activer le dépôt remi-php72
yum-config-manager --enable remi-php72
-Pour PHP 7.1 vous devez activer le dépôt remi-php71
- yum-config-manager --enable remi-php71
-
-Pour PHP 7.0 vous devez activer le dépôt remi-php70
- yum-config-manager --enable remi-php70
-
-Pour PHP 5.6 vous devez activer le dépôt remi-php56
- yum-config-manager --enable remi-php56
-
Les "Software Collections" sont dans le dépôt "remi-safe".
FAQ: https://blog.remirepo.net/pages/FAQ-en-Francais
@@ -102,8 +79,6 @@ Twitter: https://twitter.com/RemiRepository
%prep
%setup -c -T
-sed -e 's/@VER@/70/;s/@DOTVER@/7.0/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php70.repo
-sed -e 's/@VER@/71/;s/@DOTVER@/7.1/;s/VERSION/%{rhel}/' %{SOURCE4} >remi-php71.repo
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
@@ -126,6 +101,10 @@ 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 %{rhel} <= 8
+ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi.el8
+%endif
+
# YUM
for repo in *repo
do
@@ -139,6 +118,9 @@ done
%changelog
+* Fri Nov 16 2018 Remi Collet <remi@remirepo.net> - 8.0-1
+- Configuration package for remi repository on RHEL-8.0-Beta
+
* Tue Jun 19 2018 Remi Collet <remi@remirepo.net> - 6.9-4 and 7.5-2
- add php 7.3 repository
- simplify sources
diff --git a/remi-safe.repo b/remi-safe.repo
index 23a1452..148c6c2 100644
--- a/remi-safe.repo
+++ b/remi-safe.repo
@@ -5,15 +5,15 @@
[remi-safe]
name=Safe Remi's RPM repository for Enterprise Linux VERSION - $basearch
#baseurl=http://rpms.remirepo.net/enterprise/VERSION/safe/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/safe/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/safe/mirror
+#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/safe/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/safe/$basearch/mirror
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
[remi-safe-debuginfo]
name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
baseurl=http://rpms.remirepo.net/enterprise/VERSION/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.elVERSION
diff --git a/remi.repo b/remi.repo
new file mode 100644
index 0000000..1de9b9d
--- /dev/null
+++ b/remi.repo
@@ -0,0 +1,37 @@
+# Repository: http://rpms.remirepo.net/
+# Blog: http://blog.remirepo.net/
+# Forum: http://forum.remirepo.net/
+
+[remi]
+name=Remi's RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/remi/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/remi/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/remi/$basearch/mirror
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+
+[remi-test]
+name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/VERSION/test/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/test/$basearch/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/test/$basearch/mirror
+# WARNING: If you enable this repository, you must also enable "remi"
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+
+[remi-debuginfo]
+name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+
+[remi-test-debuginfo]
+name=Remi's test RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-test/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+
generated by cgit (git 2.34.1) at 2024-11-22 06:03:54 +0000