From dd468e23dccea130255191ee364be970a1439afb Mon Sep 17 00:00:00 2001 From: John W. Linville Date: Feb 04 2015 18:56:20 +0000 Subject: Use %license instead of %doc for file containing license information - Add %license entry for wireless-regdb - Correct NVR info at end of previous changelog entry --- diff --git a/crda.spec b/crda.spec index 7a5342c..6cea168 100644 --- a/crda.spec +++ b/crda.spec @@ -3,7 +3,7 @@ Name: crda Version: %{crda_version}_%{regdb_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Regulatory compliance daemon for 802.11 wireless networking Group: System Environment/Base @@ -77,11 +77,13 @@ make %{?_smp_mflags} SBINDIR=%{_sbindir}/ LIBDIR=%{_libdir}/ \ rm -rf %{buildroot} cd crda-%{crda_version} +cp LICENSE LICENSE.crda cp README README.crda make install DESTDIR=%{buildroot} MANDIR=%{_mandir}/ \ SBINDIR=%{_sbindir}/ LIBDIR=%{_libdir}/ cd ../wireless-regdb-%{regdb_version} +cp LICENSE LICENSE.wireless-regdb cp README README.wireless-regdb make install DESTDIR=%{buildroot} MANDIR=%{_mandir} @@ -110,7 +112,9 @@ rm -rf %{buildroot} %{_mandir}/man5/regulatory.bin.5* %{_mandir}/man8/crda.8* %{_mandir}/man8/regdbdump.8* -%doc crda-%{crda_version}/LICENSE crda-%{crda_version}/README.crda +%license crda-%{crda_version}/LICENSE.crda +%license wireless-regdb-%{regdb_version}/LICENSE.wireless-regdb +%doc crda-%{crda_version}/README.crda %doc wireless-regdb-%{regdb_version}/README.wireless-regdb @@ -122,7 +126,12 @@ rm -rf %{buildroot} %changelog -* Mon Feb 2 2015 John W. Linville - 3.18_2015.01.30-1 +* Wed Feb 4 2015 John W. Linville - 3.18_2015.01.30-3 +- Use %license instead of %doc for file containing license information +- Add %license entry for wireless-regdb +- Correct NVR info at end of previous changelog entry + +* Mon Feb 2 2015 John W. Linville - 3.18_2015.01.30-2 - Update crda to version 3.18 - Update wireless-regdb to version 2015.01.30 - Drop patch to add DESTDIR in install rules for libreg in crda Makefile