[packages/wireless-regdb] don't override %{_datadir} as it messes up %{_docdir} with recent rpm; rel 2

atler atler at pld-linux.org
Tue Feb 25 19:59:13 CET 2025


commit e7dd8a47f9a3f99a56911b2eafe13c60c7c10316
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Feb 25 19:41:53 2025 +0100

    don't override %{_datadir} as it messes up %{_docdir} with recent rpm; rel 2

 wireless-regdb.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/wireless-regdb.spec b/wireless-regdb.spec
index 71608e2..27c6b37 100644
--- a/wireless-regdb.spec
+++ b/wireless-regdb.spec
@@ -6,7 +6,7 @@ Summary:	Wireless regulatory database for Linux drivers
 Summary(pl.UTF-8):	Baza danych przepisów dotyczących sieci bezprzewodowych dla sterowników linuksowych
 Name:		wireless-regdb
 Version:	2025.02.20
-Release:	1
+Release:	2
 License:	ISC
 Group:		Networking/Daemons
 Source0:	https://www.kernel.org/pub/software/network/wireless-regdb/%{name}-%{version}.tar.xz
@@ -18,8 +18,6 @@ BuildRequires:	xz
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_datadir	/lib
-
 %description
 This package contains the wireless regulatory database used by all
 cfg80211 based Linux wireless drivers.
@@ -41,9 +39,9 @@ test -s dump.txt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/lib/firmware,%{_datadir}/crda,%{_mandir}/man5}
+install -d $RPM_BUILD_ROOT{/lib/firmware,/lib/crda,%{_mandir}/man5}
 cp -p regulatory.db regulatory.db.p7s $RPM_BUILD_ROOT/lib/firmware
-cp -p regulatory.bin $RPM_BUILD_ROOT%{_datadir}/crda/regulatory.bin
+cp -p regulatory.bin $RPM_BUILD_ROOT/lib/crda/regulatory.bin
 cp -p regulatory.bin.5 $RPM_BUILD_ROOT%{_mandir}/man5
 
 %clean
@@ -54,5 +52,5 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE README
 /lib/firmware/regulatory.db
 /lib/firmware/regulatory.db.p7s
-%{_datadir}/crda
+/lib/crda
 %{_mandir}/man5/regulatory.bin.5*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/wireless-regdb.git/commitdiff/e7dd8a47f9a3f99a56911b2eafe13c60c7c10316



More information about the pld-cvs-commit mailing list