From b49f5e3a14c77aedc9e7bf1e60983719b85219aa Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Tue, 22 Dec 2020 02:19:56 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/flashrom.git#d26317da2126a5d44df0b4013c217c21f97d30c9 --- .gitignore | 2 ++ flashrom.spec | 9 ++++++++- sources | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d3f872a..f0ac924 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ +/gpgkey-*.gpg /flashrom-*.tar.bz2 +/flashrom-*.tar.bz2.asc diff --git a/flashrom.spec b/flashrom.spec index aa72f4a..773c56f 100644 --- a/flashrom.spec +++ b/flashrom.spec @@ -1,15 +1,18 @@ Name: flashrom Version: 1.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Simple program for reading/writing flash chips content License: GPLv2 URL: https://flashrom.org Source0: https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2 +Source1: https://download.flashrom.org/releases/%{name}-v%{version}.tar.bz2.asc +Source2: gpgkey-58A4868B25C7CFD662FB0132A3EB95B8D9780F68.gpg # upstream already: https://review.coreboot.org/c/flashrom/+/38939 Patch0: 0001-Install-the-man-file-when-using-meson-as-a-buildsyst.patch +BuildRequires: gnupg2 BuildRequires: gcc BuildRequires: meson BuildRequires: pciutils-devel @@ -42,6 +45,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Files for development with %{name}. %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 -n %{name}-v%{version} # Replace GROUP="plugdev" specifiers with TAG+="uaccess" sed -e 's/MODE="[0-9]*", GROUP="plugdev"/TAG+="uaccess"/g' util/z60_flashrom.rules -i @@ -98,6 +102,9 @@ install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/60_f %{_libdir}/pkgconfig/flashrom.pc %changelog +* Tue Dec 22 2020 Robert Scheck - 1.2-4 +- Perform source file verification during %%prep + * Mon Jul 27 2020 Fedora Release Engineering - 1.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index dfb27ff..cefe466 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ +SHA512 (gpgkey-58A4868B25C7CFD662FB0132A3EB95B8D9780F68.gpg) = 656d1acc38955794be905f42ebe73eda24ba1ee1f6df13a1e9ab7353d69c7786ed7a06e0dc23db9dbadb223a8e0891c7bf8520fec66561b798b14a0534b12d26 SHA512 (flashrom-v1.2.tar.bz2) = 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8 +SHA512 (flashrom-v1.2.tar.bz2.asc) = 8c50e3eec79bcd70add3a75b5f5493805734444de91f1635303e70642efa1e03239edb352d1a962f750552406020c18de3e39226a2dceb17142667561042cd09