summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--remi-release.spec31
1 files changed, 16 insertions, 15 deletions
diff --git a/remi-release.spec b/remi-release.spec
index 42be1ec..969fd76 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -11,12 +11,9 @@
Name: remi-release
Version: %{fedora}
%if %{fedora} == 34
-Release: 3%{?dist}
-%endif
-%if %{fedora} == 33
Release: 4%{?dist}
%endif
-%if %{fedora} == 32
+%if %{fedora} == 33
Release: 5%{?dist}
%endif
Summary: Configuration for remi repository
@@ -80,13 +77,11 @@ Twitter: https://twitter.com/RemiRepository
%prep
%setup -c -T
-sed -e 's/@VER@/73/;s/@DOTVER@/7.3/' %{SOURCE3} >remi-php73.repo
-sed -e 's/@VER@/74/;s/@DOTVER@/7.4/' %{SOURCE3} >remi-php74.repo
sed -e 's/@VER@/80/;s/@DOTVER@/8.0/' %{SOURCE3} >remi-php80.repo
+sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE3} >remi-php81.repo
-sed -e 's/@VER@/73/;s/@DOTVER@/7.3/' %{SOURCE4} >remi-php73-test.repo
-sed -e 's/@VER@/74/;s/@DOTVER@/7.4/' %{SOURCE4} >remi-php74-test.repo
-sed -e 's/@VER@/80/;s/@DOTVER@/8.4/' %{SOURCE4} >remi-php80-test.repo
+sed -e 's/@VER@/80/;s/@DOTVER@/8.0/' %{SOURCE4} >remi-php80-test.repo
+sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE4} >remi-php81-test.repo
%build
@@ -108,21 +103,24 @@ ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r
%if %{fedora} <= 33
ln -s RPM-GPG-KEY-remi2020 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-33
%endif
-%if %{fedora} <= 32
-ln -s RPM-GPG-KEY-remi2020 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-32
-%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
-%if %{fedora} >= 31 && %{fedora} < 35
+
+%if %{fedora} < 36
+install -m 644 remi-php81.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php81.repo
+install -m 644 remi-php81-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php81-test.repo
+%endif
+
+%if %{fedora} < 35
install -m 644 remi-php80.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php80.repo
install -m 644 remi-php80-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php80-test.repo
%endif
-%if %{fedora} >= 29
+
install -Dp -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular.repo
install -Dp -m 644 %{SOURCE7} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-modular-test.repo
-%endif
+
install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debuginfo.repo
@@ -132,6 +130,9 @@ install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debugi
%changelog
+* Thu Sep 2 2021 Remi Collet <remi@remirepo.net> - 34-4, 33-5
+- add php80 repositories
+
* Mon May 17 2021 Remi Collet <remi@remirepo.net> - 34-3, 33-4
- enable repo_gpgcheck for https://github.com/remicollet/remirepo/issues/175