summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remi-modular.repo40
-rw-r--r--remi-release.spec19
-rw-r--r--remi-safe.repo16
-rw-r--r--remi.repo32
4 files changed, 54 insertions, 53 deletions
diff --git a/remi-modular.repo b/remi-modular.repo
index f9f690e..25e409a 100644
--- a/remi-modular.repo
+++ b/remi-modular.repo
@@ -3,43 +3,43 @@
# Forum: https://forum.remirepo.net/
[remi-modular]
-name=Remi's Modular repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/modular/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/modular/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/modular/$basearch/mirror
+name=Remi's Modular repository for Enterprise Linux $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/$releasever/modular/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/$releasever/modular/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/$releasever/modular/$basearch/mirror
enabled=1
gpgcheck=1
# can be enabled if not behind a proxy because of possible cache issue
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
[remi-modular-debuginfo]
-name=Remi's Modular repository for Enterprise Linux VERSION - $basearch - debuginfo
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-modular/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/debug-modular/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/debug-modular/$basearch/mirror
+name=Remi's Modular repository for Enterprise Linux $releasever - $basearch - debuginfo
+#baseurl=http://rpms.remirepo.net/enterprise/$releasever/debug-modular/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/$releasever/debug-modular/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/$releasever/debug-modular/$basearch/mirror
enabled=0
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
[remi-modular-test]
-name=Remi's Modular testing repository for Enterprise Linux VERSION - $basearch
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/modular-test/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/modular-test/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/modular-test/$basearch/mirror
+name=Remi's Modular testing repository for Enterprise Linux $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/$releasever/modular-test/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/$releasever/modular-test/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/$releasever/modular-test/$basearch/mirror
enabled=0
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
[remi-modular-test-debuginfo]
-name=Remi's Modular testing repository for Enterprise Linux VERSION - $basearch - debuginfo
-#baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-modular-test/$basearch/
-#mirrorlist=https://rpms.remirepo.net/enterprise/VERSION/debug-modular-test/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/debug-modular-test/$basearch/mirror
+name=Remi's Modular testing repository for Enterprise Linux $releasever - $basearch - debuginfo
+#baseurl=http://rpms.remirepo.net/enterprise/$releasever/debug-modular-test/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/$releasever/debug-modular-test/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/$releasever/debug-modular-test/$basearch/mirror
enabled=0
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
diff --git a/remi-release.spec b/remi-release.spec
index ba2a6b3..7704b5d 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -10,12 +10,12 @@ Name: remi-release
%if %{?rhel} == 9
# Match point release version
Version: 9.4
-Release: 1%{?dist}
+Release: 2%{?dist}
%endif
%if %{?rhel} == 8
# Match point release version
-Version: 8.9
-Release: 3%{?dist}
+Version: 8.10
+Release: 1%{?dist}
%endif
Summary: YUM configuration for remi repository
Summary(fr): Configuration de YUM pour le dépôt remi
@@ -106,10 +106,6 @@ Only used for building.
%prep
%setup -c -T
-sed -e "s/VERSION/%{rhel}/" %{SOURCE1} | tee remi.repo
-sed -e "s/VERSION/%{rhel}/" %{SOURCE2} | tee remi-safe.repo
-sed -e "s/VERSION/%{rhel}/" %{SOURCE3} | tee remi-modular.repo
-
%build
echo empty build
@@ -135,9 +131,10 @@ ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r
%endif
# DNF
-for repo in *repo
+for src in %{SOURCE1} %{SOURCE2} %{SOURCE3}
do
- install -Dp -m 644 $repo %{buildroot}%{_sysconfdir}/yum.repos.d/$repo
+ repo=$(basename $src)
+ install -Dp -m 644 $src %{buildroot}%{_sysconfdir}/yum.repos.d/$repo
done
mkdir -p %{buildroot}/opt/remi
@@ -161,6 +158,10 @@ mkdir -p %{buildroot}/opt/remi
%changelog
+* Mon May 13 2024 Remi Collet <remi@remirepo.net> - 8.10-1 and 9.4-2
+- raise dependency on redhat-release 8.10 or 9.4
+- use $releasever instead of hardcoded value in configuration files
+
* Mon May 13 2024 Remi Collet <remi@remirepo.net> - 9.4-1
- raise dependency on redhat-release 9.4
diff --git a/remi-safe.repo b/remi-safe.repo
index 54d241a..44267fd 100644
--- a/remi-safe.repo
+++ b/remi-safe.repo
@@ -3,20 +3,20 @@
# all dependencies are in base repository or in EPEL
[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/$basearch/httpsmirror
-mirrorlist=http://cdn.remirepo.net/enterprise/VERSION/safe/$basearch/mirror
+name=Safe Remi's RPM repository for Enterprise Linux $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/$releasever/safe/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/$releasever/safe/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/$releasever/safe/$basearch/mirror
enabled=1
gpgcheck=1
# can be enabled if not behind a proxy because of possible cache issue
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
[remi-safe-debuginfo]
-name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
+name=Remi's RPM repository for Enterprise Linux $releasever - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/$releasever/debug-remi/$basearch/
enabled=0
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
diff --git a/remi.repo b/remi.repo
index 4eaf838..3c8eab3 100644
--- a/remi.repo
+++ b/remi.repo
@@ -3,40 +3,40 @@
# Forum: https://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
+name=Remi's RPM repository for Enterprise Linux $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/$releasever/remi/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/$releasever/remi/$basearch/httpsmirror
+mirrorlist=http://cdn.remirepo.net/enterprise/$releasever/remi/$basearch/mirror
enabled=0
gpgcheck=1
# can be enabled if not behind a proxy because of possible cache issue
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
[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
+name=Remi's test RPM repository for Enterprise Linux $releasever - $basearch
+#baseurl=http://rpms.remirepo.net/enterprise/$releasever/test/$basearch/
+#mirrorlist=https://rpms.remirepo.net/enterprise/$releasever/test/$basearch/mirror
+mirrorlist=http://cdn.remirepo.net/enterprise/$releasever/test/$basearch/mirror
# WARNING: If you enable this repository, you must also enable "remi"
enabled=0
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
[remi-debuginfo]
-name=Remi's RPM repository for Enterprise Linux VERSION - $basearch - debuginfo
-baseurl=http://rpms.remirepo.net/enterprise/VERSION/debug-remi/$basearch/
+name=Remi's RPM repository for Enterprise Linux $releasever - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/$releasever/debug-remi/$basearch/
enabled=0
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever
[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/
+name=Remi's test RPM repository for Enterprise Linux $releasever - $basearch - debuginfo
+baseurl=http://rpms.remirepo.net/enterprise/$releasever/debug-test/$basearch/
enabled=0
gpgcheck=1
repo_gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.elVERSION
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-remi.el$releasever