rpms/broadcom-wl/F-20 broadcom-wl.spec,1.23,1.24

[Nicolas Viéville]

Author: nvieville

Update of /cvs/nonfree/rpms/broadcom-wl/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28266

Modified Files:
	broadcom-wl.spec 
Log Message:
* Wed May 20 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.248-2
- Update new Broadcom upstream URLs in SPEC file
- Update to move license file to %license
- install section cleaned-up



Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-20/broadcom-wl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- broadcom-wl.spec	17 Jul 2014 20:11:32 -0000	1.23
+++ broadcom-wl.spec	20 May 2015 16:06:52 -0000	1.24
@@ -1,13 +1,13 @@
 Name:       broadcom-wl
 Version:    6.30.223.248
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    Common files for Broadcom 802.11 STA driver
 Group:      System Environment/Kernel
 License:    Redistributable, no modification permitted
-URL:        http://www.broadcom.com/support/802.11/linux_sta.php
-Source0:    http://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz
-Source1:    http://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz
-Source2:    http://www.broadcom.com/docs/linux_sta/README_6.30.223.248.txt
+URL:        https://www.broadcom.com/support/?gid=1
+Source0:    https://www.broadcom.com/docs/linux_sta/hybrid-v35-nodebug-pcoem-6_30_223_248.tar.gz
+Source1:    https://www.broadcom.com/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-6_30_223_248.tar.gz
+Source2:    https://www.broadcom.com/docs/linux_sta/README_6.30.223.248.txt
 Source3:    broadcom-wl-blacklist.conf
 Source4:    20-wl.conf
 Source5:    api
@@ -41,8 +41,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install    -m 0755 -d         $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
-install -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/
+install    -m 0755 -d         ${RPM_BUILD_ROOT}%{_prefix}/lib/modprobe.d/
+install -p -m 0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_prefix}/lib/modprobe.d/
 install    -m 0755 -d         ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
 install -p -m 0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/
 install    -m 0755 -d         ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/
@@ -53,12 +53,22 @@
 
 %files
 %defattr(-,root,root,-)
-%doc lib/LICENSE.txt README_6.30.223.248.txt fedora.readme
+%doc README_6.30.223.248.txt fedora.readme
+%if 0%{?rhel} || 0%{?fedora} < 21
+%doc lib/LICENSE.txt
+%else
+%license lib/LICENSE.txt
+%endif
 %config(noreplace) %{_prefix}/lib/modprobe.d/broadcom-wl-blacklist.conf
 %config(noreplace) %{_sysconfdir}/dracut.conf.d/20-wl.conf
 %config(noreplace) %{_sysconfdir}/akmods/akmod-wl/api
 
 %changelog
+* Wed May 20 2015 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.248-2
+- Update new Broadcom upstream URLs in SPEC file
+- Update to move license file to %license
+- install section cleaned-up
+
 * Tue Jul 15 2014 Nicolas Viéville <nicolas.vieville at univ-valenciennes.fr> - 6.30.223.248-1
 - Upstream update to 6.30.223.248