summaryrefslogtreecommitdiffstats
path: root/remi-release.spec
diff options
context:
space:
mode:
Diffstat (limited to 'remi-release.spec')
-rw-r--r--remi-release.spec56
1 files changed, 34 insertions, 22 deletions
diff --git a/remi-release.spec b/remi-release.spec
index 614b77f..49a6ac8 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -1,6 +1,6 @@
# remirepo spec file for remi-release (Fedora)
#
-# Copyright (c) 2006-2021 Remi Collet
+# Copyright (c) 2006-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
@@ -10,14 +10,14 @@
Name: remi-release
Version: %{fedora}
-%if %{fedora} == 35
-Release: 3%{?dist}
+%if %{fedora} == 37
+Release: 1%{?dist}
%endif
-%if %{fedora} == 34
-Release: 6%{?dist}
+%if %{fedora} == 36
+Release: 2%{?dist}
%endif
-%if %{fedora} == 33
-Release: 6%{?dist}
+%if %{fedora} == 35
+Release: 5%{?dist}
%endif
Summary: Configuration for remi repository
Summary(fr): Configuration pour le dépôt remi
@@ -42,6 +42,7 @@ Source2018: RPM-GPG-KEY-remi2018
Source2019: RPM-GPG-KEY-remi2019
Source2020: RPM-GPG-KEY-remi2020
Source2021: RPM-GPG-KEY-remi2021
+Source2022: RPM-GPG-KEY-remi2022
BuildArch: noarch
@@ -49,6 +50,12 @@ Requires: /etc/yum.repos.d
Requires: fedora-release >= %{fedora}
# For smoth upgrade
+%if %{fedora} >= 37
+Obsoletes: icu71 < 71.2
+Obsoletes: libicu71 < 71.2
+Obsoletes: libicu71-devel < 71.2
+Obsoletes: libicu71-doc < 71.2
+%endif
%if %{fedora} >= 35
Obsoletes: icu69 < 69.2
Obsoletes: libicu69 < 69.2
@@ -87,10 +94,7 @@ Twitter: https://twitter.com/RemiRepository
%prep
%setup -c -T
-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@/80/;s/@DOTVER@/8.0/' %{SOURCE4} >remi-php80-test.repo
sed -e 's/@VER@/81/;s/@DOTVER@/8.1/' %{SOURCE4} >remi-php81-test.repo
@@ -106,15 +110,16 @@ install -Dp -m 644 %{SOURCE2018} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-
install -Dp -m 644 %{SOURCE2019} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2019
install -Dp -m 644 %{SOURCE2020} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2020
install -Dp -m 644 %{SOURCE2021} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2021
+install -Dp -m 644 %{SOURCE2022} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi2022
-%if %{fedora} <= 35
-ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-35
+%if %{fedora} <= 37
+ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-37
%endif
-%if %{fedora} <= 34
-ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-34
+%if %{fedora} <= 36
+ln -s RPM-GPG-KEY-remi2022 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-36
%endif
-%if %{fedora} <= 33
-ln -s RPM-GPG-KEY-remi2020 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-33
+%if %{fedora} <= 35
+ln -s RPM-GPG-KEY-remi2021 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-35
%endif
# YUM
@@ -126,23 +131,30 @@ install -m 644 remi-php81.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-
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
-
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
install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debuginfo.repo
+mkdir -p %{buildroot}/opt/remi
+
%files
%config(noreplace) %{_sysconfdir}/yum.repos.d/remi*.repo
%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi*
+%dir /opt/remi
%changelog
+* Mon Jul 11 2022 Remi Collet <remi@remirepo.net> - 37-1, 36-2, 35-5
+- Fedora 36 GPG key
+- own /opt/remi
+- enable "remi" repository by default as it provides
+ dependencies of "remi-modular"
+
+* Thu Feb 10 2022 Remi Collet <remi@remirepo.net> - 36-1, 35-4, 34-7
+- Fedora 36 using 2022 GPG key
+
* Tue Nov 30 2021 Remi Collet <remi@remirepo.net> - 34-6, 35-3
- add remi-modular-debuginfo and remi-modular-test-debuginfo
repository configurations
@@ -238,7 +250,7 @@ install -Dp -m 644 %{SOURCE8} %{buildroot}%{_sysconfdir}/yum.repos.d/remi-debugi
* Fri Mar 4 2016 Remi Collet <remi@remirepo.net> - 24-1.fc24
- Fedora release 24
-* Fri Jan 15 2016 Remi Collet <remi@remirepo.net> - %{fedora}-3.fc%{fedora}.remi
+* Fri Jan 15 2016 Remi Collet <remi@remirepo.net> - 23-3.fc23.remi
- add remi-php70-test repository
* Fri Aug 28 2015 Remi Collet <RPMS@FamilleCollet.com> - 23-1.fc23.remi