Mercurial > hg > MonetDB-release

changeset 14:229464280511

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert getting key from https, but use versioned key file.
author Sjoerd Mullender <sjoerd@acm.org>
date Tue, 26 Sep 2023 14:32:08 +0200 (18 months ago)
parents d69ea4241e1f
children 814d877088cd
files Makefile MonetDB-release.spec MonetDB-release/MonetDB-GPG-KEY MonetDB-release/MonetDB-GPG-KEY-1.2 MonetDB-release/monetdb.repo
diffstat 5 files changed, 60 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Sep 25 15:00:18 2023 +0200
+++ b/Makefile	Tue Sep 26 14:32:08 2023 +0200
@@ -14,8 +14,8 @@
 RPMBUILD = rpmbuild
 RPMBUILDARGS = --define="_tmppath /tmp" --define="_topdir $(rpmtopdir)" --define="tmpdir %{_tmppath}" --define="packager MonetDB Database System <info@monetdb.org>" --define="dist .monetdb"
 
-$(NAME)-$(VERSION).tar.gz: $(NAME).spec $(NAME)/monetdb.repo
-	tar czf $(NAME)-$(VERSION).tar.gz --transform 's,^$(NAME)/,$(NAME)-$(VERSION)/,' $(NAME).spec $(NAME)/monetdb.repo
+$(NAME)-$(VERSION).tar.gz: $(NAME).spec $(NAME)/monetdb.repo $(NAME)/MonetDB-GPG-KEY-1.2
+	tar czf $(NAME)-$(VERSION).tar.gz --transform 's,^$(NAME)/,$(NAME)-$(VERSION)/,' $(NAME).spec $(NAME)/monetdb.repo $(NAME)/MonetDB-GPG-KEY-1.2
 
 $(rpmtopdir)/rpmmacros:
 	mkdir -p $(rpmtopdir)/RPMS
--- a/MonetDB-release.spec	Mon Sep 25 15:00:18 2023 +0200
+++ b/MonetDB-release.spec	Tue Sep 26 14:32:08 2023 +0200
@@ -38,6 +38,8 @@
 
 
 %install
+%{__install} -D -p -m 0644 MonetDB-GPG-KEY-1.2 \
+    %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2
 %{__install} -D -p -m 0644 monetdb.repo \
     %{buildroot}%{_sysconfdir}/yum.repos.d/monetdb.repo
 
@@ -46,12 +48,13 @@
 %defattr(-,root,root,-)
 %doc
 %{_sysconfdir}/yum.repos.d/monetdb.repo
+%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2
 
 
 
 %changelog
-* Thu May 25 2023 Sjoerd Mullender <sjoerd@acm.org> - 1.4-1
-- Retrieve gpgkey from https.
+* Tue Sep 26 2023 Sjoerd Mullender <sjoerd@acm.org> - 1.4-1
+- Use version in name of key file.
 
 * Fri Mar 17 2023 Sjoerd Mullender <sjoerd@acm.org> - 1.3-2
 - Added SPDX tag.
--- a/MonetDB-release/MonetDB-GPG-KEY	Mon Sep 25 15:00:18 2023 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-hbJka+mZ820ZxbP1yHfz3Q==
-=xPrC
------END PGP PUBLIC KEY BLOCK-----
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB-release/MonetDB-GPG-KEY-1.2	Tue Sep 26 14:32:08 2023 +0200
@@ -0,0 +1,47 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+hbJka+mZ820ZxbP1yHfz3Q==
+=xPrC
+-----END PGP PUBLIC KEY BLOCK-----
--- a/MonetDB-release/monetdb.repo	Mon Sep 25 15:00:18 2023 +0200
+++ b/MonetDB-release/monetdb.repo	Tue Sep 26 14:32:08 2023 +0200
@@ -3,39 +3,39 @@
 baseurl=https://dev.monetdb.org/downloads/Fedora/$releasever/$basearch/
 enabled=1
 gpgcheck=1
-gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY-1.2
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2
 
 [monetdb-debuginfo]
 name=MonetDB Debug $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/Fedora/debug/$releasever/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY-1.2
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2
 
 [monetdb-source]
 name=MonetDB Source $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/Fedora/source/
 enabled=0
 gpgcheck=1
-gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY-1.2
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2
 
 [monetdb-testing]
 name=MonetDB Testing $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/testing/Fedora/$releasever/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY-1.2
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2
 
 [monetdb-testing-debuginfo]
 name=MonetDB Testing Debug $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/testing/Fedora/debug/$releasever/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY-1.2
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2
 
 [monetdb-testing-source]
 name=MonetDB Testing Source $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/testing/Fedora/source/
 enabled=0
 gpgcheck=1
-gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY-1.2
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB-1.2