From 19b24f83198af2d62499589e3994d8e0f00cb37b Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sun, 12 Mar 2017 11:54:37 +0000 Subject: [PATCH] Tweak arch build rules, minor spec cleanups, Use %%license, Build on aarch64 --- .gitignore | 10 +--------- flashrom.spec | 31 +++++++++++++++++++++---------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index aba245a..d3f872a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1 @@ -flashrom-0.9.2.tar.bz2 -/flashrom-0.9.2.tar.bz2 -/flashrom-0.9.3.tar.xz -/flashrom-0.9.3.tar.bz2 -/flashrom-0.9.4.tar.bz2 -/flashrom-0.9.5.2.tar.bz2 -/flashrom-0.9.6.1.tar.bz2 -/flashrom-0.9.7.tar.bz2 -/flashrom-0.9.9.tar.bz2 +/flashrom-*.tar.bz2 diff --git a/flashrom.spec b/flashrom.spec index 3b3df51..d830b11 100644 --- a/flashrom.spec +++ b/flashrom.spec @@ -1,23 +1,27 @@ Summary: Simple program for reading/writing flash chips content Name: flashrom Version: 0.9.9 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 -Group: Applications/System URL: http://flashrom.org + Source0: http://download.flashrom.org/releases/%{name}-%{version}.tar.bz2 Patch1: flashrom-0001-Switch-to-uaccess.patch + BuildRequires: pciutils-devel -BuildRequires: libusb-devel -BuildRequires: zlib-devel -%ifnarch %{arm} ppc %{power64} BuildRequires: libftdi-devel +BuildRequires: libusb-devel +# Used for new programmers (libusb0 will eventually be removed) +BuildRequires: libusbx-devel +BuildRequires: systemd +BuildRequires: zlib-devel +%ifarch %{ix86} x86_64 aarch64 BuildRequires: dmidecode Requires: dmidecode %endif Requires: udev -# see rhbz #450273, #495226 -ExclusiveArch: %{ix86} x86_64 ppc %{power64} %{arm} +# see rhbz #495226 +ExcludeArch: s390 s390x %description @@ -45,17 +49,24 @@ make %{?_smp_mflags} %{flashrom_flags} %install make install %{flashrom_flags} DESTDIR=%{buildroot} PREFIX=%{_prefix} -install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/lib/udev/rules.d/z60_flashrom.rules +install -D -p -m 0644 util/z60_flashrom.rules %{buildroot}/%{_udevrulesdir}/z60_flashrom.rules %files -%doc COPYING README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc README %{_sbindir}/%{name} %{_mandir}/man8/%{name}.* -/lib/udev/rules.d/z60_flashrom.rules +%{_udevrulesdir}/z60_flashrom.rules %changelog +* Sun Mar 12 2017 Peter Robinson 0.9.9-3 +- Tweak arch build rules, minor spec cleanups +- Use %%license +- Build on aarch64 + * Wed Mar 8 2017 Peter Lemenkov - 0.9.9-2 - Proper udev rules