Author: nvieville Update of /cvs/nonfree/rpms/broadcom-wl/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22209 Modified Files: broadcom-wl.spec Log Message: * Mon Jan 21 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-4 - move broadcom-wl-blacklist.conf to %{_prefix}/lib/modprobe.d/ since new dracut in F-18 - install section cleaned-up Index: broadcom-wl.spec =================================================================== RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/broadcom-wl.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- broadcom-wl.spec 21 Nov 2012 12:19:49 -0000 1.19 +++ broadcom-wl.spec 20 Jan 2013 23:47:16 -0000 1.20 @@ -1,24 +1,24 @@ -Name: broadcom-wl -Version: 5.100.82.112 -Release: 3%{?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-portsrc_x86_32-v5_100_82_11... -Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11... -Source2: http://www.broadcom.com/docs/linux_sta/README.txt -Source3: broadcom-wl-blacklist.conf -Source4: 20-wl.conf -Source5: api -Source6: fedora.readme -Patch0: broadcom-wl-5.100.82.112-license.patch - -BuildArch: noarch -Provides: wl-kmod-common = %{version} -Requires: wl-kmod >= %{version} +Name: broadcom-wl +Version: 5.100.82.112 +Release: 4%{?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-portsrc_x86_32-v5_100_82_11... +Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v5_100_82_11... +Source2: http://www.broadcom.com/docs/linux_sta/README.txt +Source3: broadcom-wl-blacklist.conf +Source4: 20-wl.conf +Source5: api +Source6: fedora.readme +Patch0: broadcom-wl-5.100.82.112-license.patch + +BuildArch: noarch +Provides: wl-kmod-common = %{version} +Requires: wl-kmod >= %{version} -ExcludeArch: ppc ppc64 +ExcludeArch: ppc ppc64 %description This package contains the license, README.txt and configuration @@ -41,12 +41,12 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/ -install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/modprobe.d/ -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/ -install -p -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_sysconfdir}/dracut.conf.d/ -mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/ -install -p -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/ +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/ +install -p -m 0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_sysconfdir}/akmods/akmod-wl/ %clean rm -rf $RPM_BUILD_ROOT @@ -54,11 +54,15 @@ %files %defattr(-,root,root,-) %doc lib/LICENSE.txt README.txt fedora.readme -%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf +%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 +* Mon Jan 21 2013 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-4 +- move broadcom-wl-blacklist.conf to %%{_prefix}/lib/modprobe.d/ since new dracut in F-18 +- install section cleaned-up + * Wed Nov 21 2012 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.112-3 - Added /etc/dracut.conf.d/20-wl.conf to workaround #2526 - Added /etc/akmods/akmod-wl/api to workaround #2548 #2562