Mercurial > hg > MonetDB-release

changeset 12:c2cc60d2f813

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Retrieve gpgkey from https.
author Sjoerd Mullender <sjoerd@acm.org>
date Thu, 25 May 2023 16:22:48 +0200 (22 months ago)
parents 276a4d472ca9
children d69ea4241e1f
files Makefile MonetDB-release.spec MonetDB-release/monetdb.repo
diffstat 3 files changed, 13 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri Mar 17 16:38:56 2023 +0100
+++ b/Makefile	Thu May 25 16:22:48 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 $(NAME)/MonetDB-GPG-KEY
-	tar czf $(NAME)-$(VERSION).tar.gz --transform 's,^$(NAME)/,$(NAME)-$(VERSION)/,' $(NAME).spec $(NAME)/monetdb.repo $(NAME)/MonetDB-GPG-KEY
+$(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
 
 $(rpmtopdir)/rpmmacros:
 	mkdir -p $(rpmtopdir)/RPMS
--- a/MonetDB-release.spec	Fri Mar 17 16:38:56 2023 +0100
+++ b/MonetDB-release.spec	Thu May 25 16:22:48 2023 +0200
@@ -7,8 +7,8 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 
 Name:		MonetDB-release
-Version:	1.3
-Release:	2%{?dist}
+Version:	1.4
+Release:	1%{?dist}
 Summary:	MonetDB DNF Repository
 
 Group:		Applications/Databases
@@ -38,8 +38,6 @@
 
 
 %install
-%{__install} -D -p -m 0644 MonetDB-GPG-KEY \
-    %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
 %{__install} -D -p -m 0644 monetdb.repo \
     %{buildroot}%{_sysconfdir}/yum.repos.d/monetdb.repo
 
@@ -48,11 +46,13 @@
 %defattr(-,root,root,-)
 %doc
 %{_sysconfdir}/yum.repos.d/monetdb.repo
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
 
 
 
 %changelog
+* Thu May 25 2023 Sjoerd Mullender <sjoerd@acm.org> - 1.4-1
+- Retrieve gpgkey from https.
+
 * Fri Mar 17 2023 Sjoerd Mullender <sjoerd@acm.org> - 1.3-2
 - Added SPDX tag.
 
--- a/MonetDB-release/monetdb.repo	Fri Mar 17 16:38:56 2023 +0100
+++ b/MonetDB-release/monetdb.repo	Thu May 25 16:22:48 2023 +0200
@@ -3,39 +3,39 @@
 baseurl=https://dev.monetdb.org/downloads/Fedora/$releasever/$basearch/
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY
 
 [monetdb-debuginfo]
 name=MonetDB Debug $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/Fedora/debug/$releasever/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY
 
 [monetdb-source]
 name=MonetDB Source $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/Fedora/source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY
 
 [monetdb-testing]
 name=MonetDB Testing $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/testing/Fedora/$releasever/$basearch/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY
 
 [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=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY
 
 [monetdb-testing-source]
 name=MonetDB Testing Source $releasever - $basearch
 baseurl=https://dev.monetdb.org/downloads/testing/Fedora/source/
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+gpgkey=https://www.monetdb.org/downloads/MonetDB-GPG-KEY