Fedora release 32

new GPG key

3 files changed, 69 insertions, 19 deletions

diff --git a/Makefile b/Makefile
index 8cd2338..ce61684 100644
--- a/Makefile
+++ b/Makefile
@@ -2,13 +2,14 @@ SRCDIR := $(shell pwd)
 NAME := $(shell basename $(SRCDIR))
 include ../common/Makefile
 
+f32:
+	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f32.remi' --define 'fedora 32'
+
 f31:
 	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f31.remi' --define 'fedora 31'
 
 f30:
 	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f30.remi' --define 'fedora 30'
 
-f29:
-	rpmbuild $(RPMDEFINES) $(SRCDEFINES) -bs $(NAME).spec --define 'dist .f29.remi' --define 'fedora 29'
 
 
diff --git a/RPM-GPG-KEY-remi2020 b/RPM-GPG-KEY-remi2020
new file mode 100644
index 0000000..b25a4e8
--- /dev/null
+++ b/RPM-GPG-KEY-remi2020
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQINBF5KmkEBEAC0XN9Q3tf1ItwsfHx1idnU2YI/P5FcLTEWAr+oqg1x7HmEg3H2
+Dj9bIRGnMkq4kHjITEbDMeRcPRjLdgolzkd5IiDCMdRTzryWSk5G8sk8l4lrCmo/
+0GPseXa2K4VbqEPFFPREwMZeoxoNulbuQZ8YYFCSsGoMcxKksUeCY/GWkloqiAdZ
+0gyDC6d3AYe9Cvynl59cOuuR+h846OrgPrv3wD+WTBGusbMAKeVb01FS1zBUzEmz
+5/drQfpsncJENytjySg/mYogdvLEYk78uftLTExWQ+dGQ7fpp/y1DrWpICGBM/hX
+V7j/8P+5IAO6iAONHeFTEAARHOXs24daX3aONRWrbmuFOT9X/+5uT+IRjzjVs4u7
+wVu5+I2e0to6Abqm4g2W1PGJD7P90s0o5obfcO6OPLBGNezFREdvG1FjTTDS9YnO
++h6HNGnssihT60naV+a6W55x20hMNUb2MJD0twBv4bOB8BI+okAD77moIKYhnN2e
+mhjZsD3VSeOLzJ1B4mD4T5rjvmM7+mmHPSGmugOFQCAlNC0xkxuUQREUb2ZDYtMO
+kyrmIU2K7jG39Ai2314gyX+IEGsfgn21kQT3qLH2Q1iJx7pUFBJPSaija8Qe4myA
+qfLaty2xJyW9MZ5KBy13auGAw74VhWraalKivp1tUlvjx/2i5HJCKpdEvwARAQAB
+tEZSZW1pJ3MgUlBNIHJlcG9zaXRvcnkgKGh0dHBzOi8vcnBtcy5yZW1pcmVwby5u
+ZXQvKSA8cmVtaUByZW1pcmVwby5uZXQ+iQJOBBMBCAA4FiEENMEL28xvGyUuULoa
+BxSRnkwhqAgFAl5KmkECGwMFCwkIBwIGFQoJCAsCBBYCAwECHgECF4AACgkQBxSR
+nkwhqAhcNg/+KQTnfmJv4WoRY4PBE6eGdNyICAK3qFgiQoEgYjDs+63n5ruPWGvt
+v3P1MUkUsVJ6Dqel8LUjbqlxBe15tTzVo49rrCDEWhtF25HVFOaZG8ABVOeN08B4
+gPL9EG8HhT78Wae+I5sl77UwuUQ9T2pShjXk/uoQVjKzxTLfLobY8dzMgC6QI0zr
+MiY5nnQ9lM1wY6H5gFbL4wAkq9hHUDXURnvw9rJqM2Il9848AdIgxZK8pRQXFbWm
+INIYlYGrj1/lV9lXCn3tfFQJHMBUTZ/TbdxmDTqsOcOB3+RgbR3VAksbqG1LYMgu
+BBBorUzCziZ8TUdbMevHWLim8O+2BTk4KjcmjKY3xuy2y7tzCsBzlSteFP/BcMa7
+gLN7yFtvGjHj6pi9RmOSK7T31lnCXTiWVMcQ1mEW8+bZE5Ac/TKLxtkCgk22t7RU
+ORE3VqKf5FUFJwLFyi/03qK+t3SGJJQ3WM5zFg7gTQzTZ7lTUqXK6r8GYTITNbCv
+nYhIR440mOz+12E3FruCoH2eqOkl3H6zyQKmP0xb1cHwNgZ3W7M4UQdgDq8uaycU
+rD9/TphEdxPm3AaZDjHES0oRyA2umBW6KbDwyr8duqZ/OIwrZuWHccNWwrsZM80R
+4QCBxZrUhAXqdthkm9AiGpYdIQ46p0nSx0QX3Ypnl74PoR70bWcGtVe5Ag0EXkqa
+QQEQALE07opKX/N3y1/pJm19Sl7YrqyWVeGYJk4zmAuQAY+JoHtMVnM9JJMOzQNv
+TziHGE3ei/kNK/E8/+6L4VMhVd02Sz8xG9OgXudL/wHHlkNIMHthnyLFv1LuFGSJ
+U8xjpIAWNoG9UhEtqFgUSsMQUuTy1ECbwbnXFFL/6/1pRuLSPpCtBtXVrDIhT8lu
+Bsp8hP6/5ix+86O4SglGe4Mdoy6f4xxVXDh9nG4PU6BmdZePHvNQA+i5uJfSimBR
+ZiiQTrfoi4H1JH8WoVLHIMAqgwPpkEfHVgBW/I/bp5iNUSHvrFaGLzjfH/N1hzCU
+C36bieuhgSBFeSUS0wxjv3BYuwcSkzlowgpnZHlrHo31ZXNKG0GNnvFtvR2k+ANf
+68VE1uIM6cDBP7N38RXHatLenoS70XsC9QwXfvvmTHPwOro5OqVVUNh90/+LFwhZ
+Czs0OVQoNoAeiul2cZ3lEQY9NijAUQGLD5MTm51AvJvrUodJ5xPoaQV09QiFmsVX
+GFULpKkLYwJM8Qw9uTAyyXoMDl2gINQaFJXsvQ5r6EQXCVrvzzwDpH0OPOCawkia
+730vfJCcOSrAWrJGYua1lPtSUJvsaXUFmpWlXpjAfZi7JZkdUFi8uV5yrrhjaK5v
+XvY69YaMO1kTOazHqOhXTIYhejqZLIvt6cPzePjedsfvE/UPABEBAAGJAjYEGAEI
+ACAWIQQ0wQvbzG8bJS5QuhoHFJGeTCGoCAUCXkqaQQIbDAAKCRAHFJGeTCGoCKFe
+D/955Sl86Ns6ariSrvJu0+6zLrkcCNJBIcdR2vyEcxhchJT/6dS7LyjXVrhiDyR3
+Xb1PSVocdb5Ccrcqch9r4TmTPXuOdmFllUxEEcqU+vSJTj7e/KMPVbW5VBEJb6k1
+Iv0ZUIxvNvFI6+lcn0RmFbInyhkaZQzf3yA27ZhReQpc/NosSdKbiU+T0/nXA7LI
+zsVRFcTx9a+zzb7Av7kPhqsJivs8yFRSskiKEEXiZlA6rBl+jAtF+H7T8Itq1d/s
+/4h5zmRTFRzrB2epRkZ7Bgt+RHUQ8Z4iAfOUrK1djOmotp47o+cClDvsfaGLXbCq
+DcOo2QdTEAbdq0Qd6QYiBwTAE+JjnjEt6rxAUw9KHu6ZOz1f8wLnKRFXFmTCM9tR
++HOVdSn+azOu5N5HKDvybrXjJNuJPD2xUHN9QGW6NCu/KqWUFT+RlYh4WepJB/Ip
+5zKQNGAaLLLhO7r06PHnsLfCYX+oG1i0bpf0rxgCzikTF5bYzrSKa3BIcPqEWtWN
+Q+gqaviGR07Nhms4TL4Y16d8jICTU4TheMeQ7l04TUtoKjIG3vZbPUtjjhmsOLa6
+YJejQnq8pFF/xgWWLP22G6J7vA19KXeSUoQW06WFmXdrtJZQs5BH8GE1uge3j+nl
+2PMufS9qcG/IngOM0E3AqlJ3SlQN+Ke/ZU7LX4sRT5UY9g==
+=4jSn
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/remi-release.spec b/remi-release.spec
index c3a902b..02b3bf4 100644
--- a/remi-release.spec
+++ b/remi-release.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for remi-release (Fedora)
 #
-# Copyright (c) 2006-2019 Remi Collet
+# Copyright (c) 2006-2020 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} == 31
+%if %{fedora} == 32
 Release:        1%{?dist}
 %endif
-%if %{fedora} == 30
+%if %{fedora} == 31
 Release:        2%{?dist}
 %endif
-%if %{fedora} == 29
-Release:        8%{?dist}
+%if %{fedora} == 30
+Release:        3%{?dist}
 %endif
 Summary:        Configuration for remi repository
 Summary(fr):	Configuration pour le dépôt remi
@@ -41,6 +41,7 @@ Source2000:     RPM-GPG-KEY-remi
 Source2017:     RPM-GPG-KEY-remi2017
 Source2018:     RPM-GPG-KEY-remi2018
 Source2019:     RPM-GPG-KEY-remi2019
+Source2020:     RPM-GPG-KEY-remi2020
 
 BuildArch:      noarch
 
@@ -58,10 +59,6 @@ the --enablerepo=remi option for %{pkgman}.
 For PHP 7.4 you must enable the remi-php74 repository:
     %{pkgman} config-manager --enable remi-php74
 %endif
-%if %{fedora} >= 27 && %{fedora} <= 29
-For PHP 7.3 you must enable the remi-php73 repository:
-    %{pkgman} config-manager --enable remi-php73
-%endif
 FAQ:     https://blog.remirepo.net/pages/English-FAQ
 Forum:   https://forum.remirepo.net/
 Twitter: https://twitter.com/RemiRepository
@@ -76,10 +73,6 @@ l'option --enablerepo=remi de %{pkgman}.
 Pour PHP 7.4 vous devez activer le dépôt remi-php74
     %{pkgman} config-manager --enable remi-php73
 %endif
-%if %{fedora} >= 27 && %{fedora} <= 29
-Pour PHP 7.3 vous devez activer le dépôt remi-php73
-    %{pkgman} config-manager --enable remi-php73
-%endif
 FAQ:     https://blog.remirepo.net/pages/FAQ-en-Francais
 Forum:   https://forum.remirepo.net/
 Twitter: https://twitter.com/RemiRepository
@@ -113,7 +106,11 @@ 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
 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
 
+%if %{fedora} <= 32
+ln -s RPM-GPG-KEY-remi2020  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-32
+%endif
 %if %{fedora} <= 31
 ln -s RPM-GPG-KEY-remi2019  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-31
 %endif
@@ -127,10 +124,6 @@ ln -s RPM-GPG-KEY-remi2018  %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-r
 # 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} >= 27 && %{fedora} <= 29
-install -m 644 remi-php73.repo      %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php73.repo
-install -m 644 remi-php73-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php73-test.repo
-%endif
 %if %{fedora} >= 29 && %{fedora} <= 31
 install -m 644 remi-php74.repo      %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php74.repo
 install -m 644 remi-php74-test.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-php74-test.repo
@@ -152,6 +145,10 @@ install -Dp -m 644 remi-glpi94.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi-
 
 
 %changelog
+* Mon Feb 17 2020 Remi Collet <remi@remirepo.net> - 32-1, 31-2, 30-3
+- Fedora release 32
+- new GPG key
+
 * Fri Mar  1 2019 Remi Collet <remi@remirepo.net> - 31-1, 30-2, 29-8
 - add fedora 31 and php74 repositories