diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | RPM-GPG-KEY-remi2019 | 52 | ||||
| -rw-r--r-- | remi-release.spec | 17 |
3 files changed, 69 insertions, 3 deletions
@@ -2,6 +2,9 @@ SRCDIR := $(shell pwd) NAME := $(shell basename $(SRCDIR)) include ../common/Makefile +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-remi2019 b/RPM-GPG-KEY-remi2019 new file mode 100644 index 0000000..7c587c1 --- /dev/null +++ b/RPM-GPG-KEY-remi2019 @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +=CStU +-----END PGP PUBLIC KEY BLOCK----- diff --git a/remi-release.spec b/remi-release.spec index ace0729..538edb7 100644 --- a/remi-release.spec +++ b/remi-release.spec @@ -1,6 +1,6 @@ # remirepo spec file for remi-release (Fedora) # -# Copyright (c) 2006-2018 Remi Collet +# Copyright (c) 2006-2019 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -10,11 +10,14 @@ Name: remi-release Version: %{fedora} +%if %{fedora} == 30 +Release: 1%{?dist} +%endif %if %{fedora} == 29 -Release: 6%{?dist} +Release: 7%{?dist} %endif %if %{fedora} == 28 -Release: 6%{?dist} +Release: 7%{?dist} %endif %if %{fedora} == 27 Release: 5%{?dist} @@ -43,6 +46,7 @@ Source8: remi-debug.repo Source2000: RPM-GPG-KEY-remi Source2017: RPM-GPG-KEY-remi2017 Source2018: RPM-GPG-KEY-remi2018 +Source2019: RPM-GPG-KEY-remi2019 BuildArch: noarch @@ -114,7 +118,11 @@ rm -rf %{buildroot} install -Dp -m 644 %{SOURCE2000} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi 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 +%if %{fedora} <= 30 +ln -s RPM-GPG-KEY-remi2019 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-30 +%endif %if %{fedora} <= 29 ln -s RPM-GPG-KEY-remi2018 %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-remi-29 %endif @@ -156,6 +164,9 @@ install -Dp -m 644 remi-glpi94.repo %{buildroot}%{_sysconfdir}/yum.repos.d/remi- %changelog +* Fri Mar 1 2019 Remi Collet <remi@remirepo.net> - 30-1 +- Fedora release 30 + * Fri Dec 21 2018 Remi Collet <remi@remirepo.net> - 29-6 and 28-6 - add remi-glpi94 repository |