From 2b70ca976041b7a0446e238402f78e4337348767de15231ae106dd897bfda70c Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 2 Jun 2021 18:58:48 +0000 Subject: [PATCH] Accepting request 896968 from home:gmbr3:Active - Use %_firmwaredir OBS-URL: https://build.opensuse.org/request/show/896968 OBS-URL: https://build.opensuse.org/package/show/Base:System/linux-atm?expand=0&rev=25 --- linux-atm.changes | 5 +++++ linux-atm.spec | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/linux-atm.changes b/linux-atm.changes index 1f803c5..58af503 100644 --- a/linux-atm.changes +++ b/linux-atm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 2 17:51:26 UTC 2021 - Callum Farmer + +- Use %_firmwaredir + ------------------------------------------------------------------- Fri Dec 6 11:26:11 UTC 2019 - Martin Pluskal diff --git a/linux-atm.spec b/linux-atm.spec index 7418c6d..43814f7 100644 --- a/linux-atm.spec +++ b/linux-atm.spec @@ -1,7 +1,7 @@ # # spec file for package linux-atm # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,9 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +%if %{undefined _firmwaredir} +%define _firmwaredir /lib/firmware +%endif %global sover 1 Name: linux-atm Version: 2.5.2 @@ -36,6 +38,8 @@ Patch3: linux-atm-2.5.2-remove-headers-crude-hack.patch # PATCH-FIX-UPSTREAM fix-build-after-y2038-changes-in-glibc.patch -- fix build after y2038 changes in glibc Patch4: fix-build-after-y2038-changes-in-glibc.patch BuildRequires: bison +BuildRequires: autoconf +BuildRequires: libtool BuildRequires: flex BuildRequires: glibc-devel @@ -62,6 +66,8 @@ networking. %autosetup -p1 %build +sed 's|/lib/firmware|%{_firmwaredir}|g' -i src/extra/Makefile.am +autoreconf -fiv %configure --disable-static %make_build @@ -78,8 +84,8 @@ find %{buildroot} -type f -name "*.la" -delete -print %config(noreplace) %{_sysconfdir}/hosts.atm %{_bindir}/* %{_sbindir}/* -/lib/firmware/* -%{_mandir}/man*/*.gz +%{_firmwaredir}/* +%{_mandir}/man*/*%{?ext_man} %files -n libatm%{sover} %license COPYING COPYING.GPL COPYING.LGPL