Mercurial > hg > MonetDB-release-epel

changeset 6:bdfae2ec4160

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge heads, taking the older (original) version.
author Sjoerd Mullender <sjoerd@acm.org>
date Thu, 10 Aug 2017 16:23:35 +0200 (2017-08-10)
parents 4e6313f602da (diff) 0ac4db5158ca (current diff)
children fbf63218588c
files Makefile MonetDB-release-epel-1.3/MonetDB-GPG-KEY MonetDB-release-epel-1.3/monetdb.repo MonetDB-release-epel.spec
diffstat 7 files changed, 94 insertions(+), 145 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Aug 10 15:49:08 2017 +0200
+++ b/Makefile	Thu Aug 10 16:23:35 2017 +0200
@@ -12,8 +12,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)-$(VERSION)/monetdb.repo $(NAME)-$(VERSION)/MonetDB-GPG-KEY $(NAME)-$(VERSION)/MonetDB-GPG-KEY2
-	tar czf $(NAME)-$(VERSION).tar.gz $(NAME).spec $(NAME)-$(VERSION)/monetdb.repo $(NAME)-$(VERSION)/MonetDB-GPG-KEY $(NAME)-$(VERSION)/MonetDB-GPG-KEY2
+$(NAME)-$(VERSION).tar.gz: $(NAME).spec $(NAME)-$(VERSION)/monetdb.repo $(NAME)-$(VERSION)/MonetDB-GPG-KEY
+	tar czf $(NAME)-$(VERSION).tar.gz $(NAME).spec $(NAME)-$(VERSION)/monetdb.repo $(NAME)-$(VERSION)/MonetDB-GPG-KEY
 
 $(rpmtopdir)/rpmmacros:
 	mkdir -p $(rpmtopdir)/RPMS
--- a/MonetDB-release-epel-1.2/MonetDB-GPG-KEY	Thu Aug 10 15:49:08 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-SXakPyd1b/2A
-=9ihK
------END PGP PUBLIC KEY BLOCK-----
--- a/MonetDB-release-epel-1.2/MonetDB-GPG-KEY2	Thu Aug 10 15:49:08 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFmBxt8BCADq5XGEVFQgQ1RNq9Bkh5BqmKc4dPd2CTf7dg7zrFXKoYdBIEpG
-n01msC/5Uhakc5p32zp43SlsGYy8hkFyJTvB3kZp6dDDLl9b7m55dbYYu9061/oZ
-HpbjnDkuFMbnIpoJchd9OT4hF6BRTFaTzwmulmRLDlqx79SxftCe33Ra0UXYZot3
-uDOmOJYssS+luDiD93Y5LDGf67A+xA0sc2Fw424i7YMVy52NaxnimK9oS99VEPG5
-pvUGO9jrfo9RrkqIq1FtraBRWH93wfMhLkLuP/3YSP2HaWgsDK3PmHdxENCdza2x
-CNc8QG4LPurcfoVSLKV1IYntiVZuvwkNUDnxABEBAAG0M01vbmV0REIgRGF0YWJh
-c2UgU3lzdGVtIFBhY2thZ2VyIDxpbmZvQG1vbmV0ZGIub3JnPokBOAQTAQIAIgUC
-WYHG3wIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQ9lRj4t8OVPNLTwf+
-LdfQXPwqfDCSFtjL60uslfE4+XxrUFW3SJ4cJ8g/5WOF4c6vUIddH29jhbE2EMLs
-WkPYnMFS8uae0eZLHzg1mZ8EQHFVN4xTYOwzQzd6xSM9/UVhkxXBc6rk6zaozO+6
-WQU2YRTTQ7lQzNhnrATnoHO4IO18gCZ9EkYokXByX7GFgWAk9w5RlTlERs3e628B
-WSsckWCuq3LyphGrxNyf4I2e4BuFs17Vl7d7uld5BMX09gjHofqZU7hZRcD8pkY4
-rw+RJAqSkq8XlxOuZqUEaBvXYwifJGW1n2vhXNuKNFBNWXsSvwCdMkpPJleAy7Ud
-aMJM1pymYw6umgvykX7z3YkBHAQQAQIABgUCWYLbpQAKCRCEjMU+i61mID75B/4o
-0ybbnzzMezy4zISqt9cBUdpg7Fmyult8RLWl2NRTmtLzoxZI7pnJkGgTACs4JBcZ
-vbASVOD7JpYtCbr+sTgQwa8oxkqZTLviHhsZHdCh0QLrAM635fHc/SZbA353LsP2
-Tys8OOMo6WzLBlAhGF30HiNM8S2GjDS+mRsg/WGKQNvv7YIJaOUnH1Fyudkwh+fj
-4rzo/+Gw/1jVxCbtfs6G6MxVDsyaBUaoC7W5mU+JZzccPnvpgU7iBR6sLjKa+w5w
-j2luPEx7jMY1hD4adShYxo2/70UyBv+oNOseeNu0hZWFwPYrJRi01yrlLgx2Nf7k
-pinoFdGmb3wF/WBkMYNFiQIcBBABCAAGBQJZgvahAAoJEAi7vQ4T8l1rP7IQAJzZ
-mXfHvGHdwAbL4ZJ3l/CAMugjcWcd1gTQBztY0JzKszU2SctSt7XP3wEQsVTOtYfo
-TV/UACUSB8cHjNcr6IDPOoWs6GZFHbgDHrYIv4O09oKbZRHAaDeF/kAezlhz0PU2
-r5Yh6zHGR6Y3KPLFZ81wZdnKk47Z3eeUdh6qoyA1mArZUO3WMcE7zGYN9OHhHF6O
-IDJjiXsC9spzKBzgkTCirKIWp6rcRhqBQcXWZwQkH6GKM3dS90f7gZQ7YTTMQM+c
-pHoDe2EiZTKHVRWFA+fOKTyr+H1+U47WYsH+l9L1th5Z9ulKpyHerB01nSxNAYWl
-zwyT36uQvgytznZfX1HG3sMbQTzl1MGjbCEX9vvoSfvLO0Gbce/230iryu1UWtgI
-OUFDfTQ7IFBLF+Sr9AWRLPVgn8kgfoQx8SOZbs+6J2xXXa3SIsiwMX63SZs510FQ
-udHWyJZg6DdKZVwwf6ATUSVLjq6lGLj7tM0RIN3d1KEZk0CYXfdd1Pv338B7Jp+k
-gBp/UZzlzVWJPDinuHRJdUL19JCEes1kMxY7gKZ9vx+Xh/uN/WrXlDTlOmDqf2qt
-vY6lI6Lv8+QvBhZ20BUTIFG783Yhow7KqmTBmCJv+Grpi3EEBK38dc+sJyHMP+yx
-DrpmZK7TjsGIoIhy/e4lMVnPLnX7S/g4j/TfUZIBuQENBFmBxt8BCACamcpqr52s
-y47+zUaDjgZrxlWUuVW+q0kBoxFZY4CvfIdHkmcKCeMkBhEzeqNijUXLdxLz4YJl
-G90gMPCYV8LA24Un9ewVnBoYmubYIuq1n/c9RFugnKX4iUyCWXNHLw4ZLKUGfmXn
-ce8B2il/A0h+WuYkkVW4IES4KBS4kzluf4/+fCEKwqY9fR7toNgAdHrjkU3pFmXd
-ll+9q3tnqF1QIcsaBVB4v6qgVIUBMXsAAMjyU49GP4GY5wVnsUCWZOICgv6ylf7l
-H/zZiGXux74Q/8xUlj4O5aRiI1gC8vXRVH1ovZ3JVekd2Lb7AgjWrybCbEjW/gne
-fqwxpREvByJxABEBAAGJAR8EGAECAAkFAlmBxt8CGwwACgkQ9lRj4t8OVPMyOQgA
-r0nZyboszwuQc/07WdtxK1GvEio99kjwINl3Wt1StAeQdhJKwGRhxvoen/4ngfxa
-vvvwWXRrMsppwhZL+zs1L1VjvK0hbkU++fk5+J4+pC27OL/w6IUO/4SY3Jj62sYV
-u0ugsp/jRCUr/0IenS9zhEsXCukFA6FSqZfhfF6hVCtksLaM6iwBh1JvQaVR+TJl
-/giL4eyY+pkl9gtRfrEz7/NFr8gFJ+U3QYlZkzw4fM0WatVmn18YSY3DjpYSgtdu
-3qHkIp/A1gSd6xrwYPU8K+l2b+DkO+TUKL0UkM1uIaMhA+js5eRcZLKKXHoO2wkU
-hbJka+mZ820ZxbP1yHfz3Q==
-=xPrC
------END PGP PUBLIC KEY BLOCK-----
--- a/MonetDB-release-epel-1.2/monetdb.repo	Thu Aug 10 15:49:08 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-[monetdb]
-name=MonetDB $releasever - $basearch
-baseurl=https://dev.monetdb.org/downloads/epel/$releasever/$basearch/
-enabled=1
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
-
-[monetdb-debuginfo]
-name=MonetDB Debug $releasever - $basearch
-baseurl=https://dev.monetdb.org/downloads/epel/debug/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
-
-[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
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
-
-[monetdb-testing]
-name=MonetDB Testing $releasever - $basearch
-baseurl=https://dev.monetdb.org/downloads/testing/epel/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
-
-[monetdb-testing-debuginfo]
-name=MonetDB Testing Debug $releasever - $basearch
-baseurl=https://dev.monetdb.org/downloads/testing/epel/debug/$releasever/$basearch/
-enabled=0
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
-
-[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
-       file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MonetDB-release-epel-1.3/MonetDB-GPG-KEY	Thu Aug 10 16:23:35 2017 +0200
@@ -0,0 +1,47 @@
+-----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-epel-1.3/monetdb.repo	Thu Aug 10 16:23:35 2017 +0200
@@ -0,0 +1,41 @@
+[monetdb]
+name=MonetDB $releasever - $basearch
+baseurl=https://dev.monetdb.org/downloads/epel/$releasever/$basearch/
+enabled=1
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[monetdb-debuginfo]
+name=MonetDB Debug $releasever - $basearch
+baseurl=https://dev.monetdb.org/downloads/epel/debug/$releasever/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[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
+
+[monetdb-testing]
+name=MonetDB Testing $releasever - $basearch
+baseurl=https://dev.monetdb.org/downloads/testing/epel/$releasever/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[monetdb-testing-debuginfo]
+name=MonetDB Testing Debug $releasever - $basearch
+baseurl=https://dev.monetdb.org/downloads/testing/epel/debug/$releasever/$basearch/
+enabled=0
+gpgcheck=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
+
+[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
--- a/MonetDB-release-epel.spec	Thu Aug 10 15:49:08 2017 +0200
+++ b/MonetDB-release-epel.spec	Thu Aug 10 16:23:35 2017 +0200
@@ -1,6 +1,6 @@
 Name:		MonetDB-release-epel
-Version:	1.2
-Release:	3%{?dist}
+Version:	1.3
+Release:	1%{?dist}
 Provides:	MonetDB-release-epel6 = %{version}-%{release}
 Obsoletes:	MonetDB-release-epel6 < 1.1-1
 Summary:	MonetDB YUM Repository for EPEL
@@ -35,8 +35,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-GPG-KEY2 \
-    %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
 %{__install} -D -p -m 0644 monetdb.repo \
     %{buildroot}%{_sysconfdir}/yum.repos.d/monetdb.repo
 
@@ -46,13 +44,12 @@
 %doc
 %{_sysconfdir}/yum.repos.d/monetdb.repo
 %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-MonetDB
-%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-MonetDB2
 
 
 
 %changelog
-* Thu Aug 10 2017 Sjoerd Mullender <sjoerd@acm.org> - 1.2-3
-- Create two key files, one for the old and one for the new key.
+* Thu Aug  3 2017 Sjoerd Mullender <sjoerd@acm.org> - 1.3-1
+- Removed old signing key.
 
 * Thu Aug  3 2017 Sjoerd Mullender <sjoerd@acm.org> - 1.2-1
 - Added a new signing key: future RPMs will be signed with the new key.