commit 6efab531bba6d96a0885e61d8c7b395531dedd22 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Sun Jun 14 18:29:53 2020 +0100 Add gpg source check gpgkey.asc | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ mpd.spec | 15 +++++++----- 2 files changed, 90 insertions(+), 6 deletions(-) --- diff --git a/gpgkey.asc b/gpgkey.asc new file mode 100644 index 0000000..2d45b97 --- /dev/null +++ b/gpgkey.asc @@ -0,0 +1,81 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: SKS 1.1.6 +Comment: Hostname: carles.tubio.sks-database_1 + +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 +o0F+Mjv2m2Ah5d5C56Q4mZiUn3KxHw== +=67fQ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/mpd.spec b/mpd.spec index 38b5b62..447a264 100644 --- a/mpd.spec +++ b/mpd.spec @@ -24,13 +24,14 @@ URL: https://www.musicpd.org Source0: %{url}/download/mpd/0.21/mpd-%{version}.tar.xz Source1: %{url}/download/mpd/0.21/mpd-%{version}.tar.xz.sig +Source2: https://pgp.key-server.io/download/0x236E8A58C6DB4512#/gpgkey.asc # Note that the 0.18.x branch doesn't yet work with Fedora's version of # libmpcdec which needs updating. # https://bugzilla.redhat.com/show_bug.cgi?id=1014468 # http://bugs.musicpd.org/view.php?id=3814#bugnotes -Source2: mpd.logrotate -Source3: mpd.tmpfiles.d -Source4: mpd.xml +Source3: mpd.logrotate +Source4: mpd.tmpfiles.d +Source5: mpd.xml Patch0: mpd-0.18-mpdconf.patch Patch1: mpd-0.20-remove_NoNewPrivileges.patch @@ -44,6 +45,7 @@ BuildRequires: ffmpeg-devel BuildRequires: firewalld-filesystem BuildRequires: flac-devel BuildRequires: gcc +BuildRequires: gnupg2 BuildRequires: jack-audio-connection-kit-devel BuildRequires: lame-devel BuildRequires: libao-devel @@ -116,6 +118,7 @@ This package contains FirewallD file for MPD. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %setup -q %patch0 -p0 %patch1 -p1 @@ -145,12 +148,12 @@ sed -i -e 's@sphinx-build@sphinx-build-3@g' doc/meson.build %install %{meson_install} -install -p -D -m 0644 %{SOURCE2} \ +install -p -D -m 0644 %{SOURCE3} \ %{buildroot}%{_sysconfdir}/logrotate.d/mpd -install -p -D -m 0644 %{SOURCE3} \ - %{buildroot}%{_prefix}/lib/tmpfiles.d/mpd.conf install -p -D -m 0644 %{SOURCE4} \ + %{buildroot}%{_prefix}/lib/tmpfiles.d/mpd.conf +install -p -D -m 0644 %{SOURCE5} \ %{buildroot}%{_prefix}/lib/firewalld/services/mpd.xml mkdir -p %{buildroot}/run install -d -m 0755 %{buildroot}/%{mpd_rundir}