rpms/rpmfusion-nonfree-package-config-smart/F-16 rpmfusion-nonfree-package-config-smart.spec, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25474/F-16
Modified Files:
rpmfusion-nonfree-package-config-smart.spec
Log Message:
Fix for nonfree version requirement on free
Index: rpmfusion-nonfree-package-config-smart.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/F-16/rpmfusion-nonfree-package-config-smart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-nonfree-package-config-smart.spec 27 Oct 2011 21:40:15 -0000 1.5
+++ rpmfusion-nonfree-package-config-smart.spec 4 Nov 2011 22:57:51 -0000 1.6
@@ -9,7 +9,7 @@
Summary: RPM Fusion (nonfree) configuration files for the Smart package manager
Name: rpmfusion-nonfree-package-config-smart
Version: 16
-Release: 2
+Release: 3
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -20,7 +20,7 @@
Source4: rpmfusion-nonfree-updates-testing.channel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: smart
-Requires: rpmfusion-free-package-config-smart >= %{version}-%{release}
+Requires: rpmfusion-free-package-config-smart >= %{version}
Provides: smart-config-rpmfusion-nonfree = %{version}-%{release}
%description
@@ -54,6 +54,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Nov 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-3
+- Fix version requirement for rpmfusion-free
+
* Wed Oct 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-2
- Fix basearch on i386 - rfbz#2000
12 years, 6 months
rpms/rpmfusion-nonfree-package-config-smart/devel rpmfusion-nonfree-package-config-smart.spec, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25474/devel
Modified Files:
rpmfusion-nonfree-package-config-smart.spec
Log Message:
Fix for nonfree version requirement on free
Index: rpmfusion-nonfree-package-config-smart.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/devel/rpmfusion-nonfree-package-config-smart.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-nonfree-package-config-smart.spec 27 Oct 2011 21:40:15 -0000 1.5
+++ rpmfusion-nonfree-package-config-smart.spec 4 Nov 2011 22:57:51 -0000 1.6
@@ -9,7 +9,7 @@
Summary: RPM Fusion (nonfree) configuration files for the Smart package manager
Name: rpmfusion-nonfree-package-config-smart
Version: 16
-Release: 2
+Release: 3
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -20,7 +20,7 @@
Source4: rpmfusion-nonfree-updates-testing.channel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: smart
-Requires: rpmfusion-free-package-config-smart >= %{version}-%{release}
+Requires: rpmfusion-free-package-config-smart >= %{version}
Provides: smart-config-rpmfusion-nonfree = %{version}-%{release}
%description
@@ -54,6 +54,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Nov 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-3
+- Fix version requirement for rpmfusion-free
+
* Wed Oct 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 16-2
- Fix basearch on i386 - rfbz#2000
12 years, 6 months
rpms/rpmfusion-nonfree-package-config-smart/F-14 rpmfusion-nonfree-package-config-smart.spec, 1.4, 1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25474/F-14
Modified Files:
rpmfusion-nonfree-package-config-smart.spec
Log Message:
Fix for nonfree version requirement on free
Index: rpmfusion-nonfree-package-config-smart.spec
===================================================================
RCS file: /cvs/nonfree/rpms/rpmfusion-nonfree-package-config-smart/F-14/rpmfusion-nonfree-package-config-smart.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmfusion-nonfree-package-config-smart.spec 26 Oct 2011 19:27:29 -0000 1.4
+++ rpmfusion-nonfree-package-config-smart.spec 4 Nov 2011 22:57:52 -0000 1.5
@@ -9,7 +9,7 @@
Summary: RPM Fusion (nonfree) configuration files for the Smart package manager
Name: rpmfusion-nonfree-package-config-smart
Version: 14
-Release: 2
+Release: 3
License: GPLv2+
Group: System Environment/Base
URL: http://rpmfusion.org/
@@ -20,7 +20,7 @@
Source4: rpmfusion-nonfree-updates-testing.channel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: smart
-Requires: rpmfusion-free-package-config-smart >= %{version}-%{release}
+Requires: rpmfusion-free-package-config-smart >= %{version}
Provides: smart-config-rpmfusion-nonfree = %{version}-%{release}
%description
@@ -54,6 +54,9 @@
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel
%changelog
+* Fri Nov 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 14-3
+- Fix version requirement for rpmfusion-free
+
* Wed Oct 26 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 14-2
- Fix basearch on i386 - rfbz#2000
12 years, 6 months
rpms/xorg-x11-drv-catalyst/F-15 xorg-x11-drv-catalyst.spec,1.7,1.8
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18904/F-15
Modified Files:
xorg-x11-drv-catalyst.spec
Log Message:
Various fixed for xorg-x11-drv-catalyst
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-15/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- xorg-x11-drv-catalyst.spec 29 Oct 2011 00:45:01 -0000 1.7
+++ xorg-x11-drv-catalyst.spec 4 Nov 2011 22:09:39 -0000 1.8
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-catalyst
Version: 11.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
@@ -123,6 +123,9 @@
mkdir amdxvba
pushd amdxvba
tar xfz %{SOURCE1}
+# rename docs
+mv -f LICENSE AMD_XvBA_LICENSE
+mv -f README AMD_XvBA_README
popd
# Create tarball of kmod data for use later
@@ -245,17 +248,23 @@
# Move XvBA data file to correct location
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
mv $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.cap $RPM_BUILD_ROOT%{_prefix}/lib
+chmod 0644 $RPM_BUILD_ROOT%{_prefix}/lib/libAMDXvBA.cap
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT%{atilibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
# If we want versioned libs, then we need to change this and the loop above
# to install the libs as soname.so.%{version}
-ln -s fglrx-libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/fglrx-libGL.so.1
-ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_dm.so.1
-ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libAMDXvBA.so.1
-ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libXvBAW.so.1
-ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libatiuki.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so.1
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so.1
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so.1
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so.1
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so
install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_large.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_large.xpm
install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/catalyst-config-display
@@ -282,17 +291,28 @@
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/amdcccle
chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/amdnotifyui
+# ld.so.conf.d file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
+
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
-# Update the user's version numbers in the AMD Control Center. Replacement
-# values can be obtained by executing:
-# cat fglrxpkg/etc/ati/amdpcsdb.default | grep -i version
+# Update the user's version numbers in the AMD Control Center.
if [ -f %{_sysconfdir}/amdpcsdb ];then
- sed -i -e 's|ReleaseVersion=.*|S8.892-110914m-125703C-ATI|' %{_sysconfdir}/amdpcsdb
- sed -i -e 's|Catalyst_Version=.*|S11.9|' %{_sysconfdir}/amdpcsdb
+ ReleaseVersion=$(sed '/ReleaseVersion=S/!d; s/ReleaseVersion=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${ReleaseVersion}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,ReleaseVersion >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,ReleaseVersion,${ReleaseVersion} >/dev/null 2>&1
+ fi
+ Catalyst_Version=$(sed '/Catalyst_Version=S/!d; s/Catalyst_Version=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${Catalyst_Version}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,Catalyst_Version >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,Catalyst_Version,${Catalyst_Version} >/dev/null 2>&1
+ fi
fi ||:
if [ "${1}" -eq 1 ]; then
@@ -301,7 +321,8 @@
# Add init script(s) and start it
/sbin/chkconfig --add catalyst
/sbin/chkconfig --add atieventsd
- /etc/init.d/catalyst start &>/dev/null
+ /sbin/service catalyst start >/dev/null 2>&1
+ /sbin/service atieventsd start >/dev/null 2>&1
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null
@@ -360,6 +381,7 @@
%files libs
%defattr(-,root,root,-)
+%ghost %{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
%dir %{atilibdir}
%{atilibdir}/*.so*
%{_libdir}/dri/
@@ -367,10 +389,22 @@
%files devel
%defattr(-,root,root,-)
%doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
+%doc amdxvba/doc/AMD_XvBA_Spec_v0_74_01_AES_2.pdf
+%doc amdxvba/AMD_XvBA_LICENSE amdxvba/AMD_XvBA_README
%{atilibdir}/*.a
%{_includedir}/fglrx/
+# enumerate development symlinks
+%{atilibdir}/libGL.so
+%{atilibdir}/libfglrx_dm.so
+%{atilibdir}/libAMDXvBA.so
+%{atilibdir}/libXvBAW.so
+%{atilibdir}/libatiuki.so
%changelog
+* Fri Nov 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.9-3
+- Various fixes from rfbz#1965
+- Ghost catalyst libraries directory in ld.so.conf.d
+
* Fri Oct 28 2011 Stewart Adam <s.adam at diffingo.com> 11.9-2
- Fix several packaging bugs (#1932, #1965)
@@ -386,7 +420,17 @@
* Mon May 2 2011 Stewart Adam <s.adam at diffingo.com> 11.4-1
- Update to Catalyst 11.4 (internal version 8.84.1)
-- Port changes from F-14 branch
+
+* Sat Feb 19 2011 Stewart Adam <s.adam at diffingo.com> - 11.2-1
+- Update to Catalyst 11.2 (internal version 8.82.1)
+
+* Wed Dec 29 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-2
+- Fix semantic errors in catalyst-config-display that caused tracebacks on F-14
+- Remove VideoOverlay from xorg.conf as it is no longer used by the driver
+
+* Sun Dec 26 2010 Stewart Adam <s.adam at diffingo.com> - 10.12-1
+- Update to Catalyst 10.12 (internal version 8.80.1)
+- Merge changes from F-13 branch
* Sun May 3 2009 Stewart Adam <s.adam at diffingo.com> - 9.4-4
- Make the ExclusiveArch dynamic
12 years, 6 months
rpms/xorg-x11-drv-catalyst/F-14 xorg-x11-drv-catalyst.spec, 1.10, 1.11
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv18904/F-14
Modified Files:
xorg-x11-drv-catalyst.spec
Log Message:
Various fixed for xorg-x11-drv-catalyst
Index: xorg-x11-drv-catalyst.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-catalyst/F-14/xorg-x11-drv-catalyst.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-catalyst.spec 29 Oct 2011 00:31:38 -0000 1.10
+++ xorg-x11-drv-catalyst.spec 4 Nov 2011 22:09:39 -0000 1.11
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-catalyst
Version: 11.9
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: AMD's proprietary driver for ATI graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
@@ -123,6 +123,9 @@
mkdir amdxvba
pushd amdxvba
tar xfz %{SOURCE1}
+# rename docs
+mv -f LICENSE AMD_XvBA_LICENSE
+mv -f README AMD_XvBA_README
popd
# Create tarball of kmod data for use later
@@ -245,17 +248,23 @@
# Move XvBA data file to correct location
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
mv $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.cap $RPM_BUILD_ROOT%{_prefix}/lib
+chmod 0644 $RPM_BUILD_ROOT%{_prefix}/lib/libAMDXvBA.cap
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT%{atilibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
# If we want versioned libs, then we need to change this and the loop above
# to install the libs as soname.so.%{version}
-ln -s fglrx-libGL.so.1.2 $RPM_BUILD_ROOT/%{atilibdir}/fglrx-libGL.so.1
-ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libfglrx_dm.so.1
-ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libAMDXvBA.so.1
-ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libXvBAW.so.1
-ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT/%{atilibdir}/libatiuki.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so.1
+ln -s libGL.so.1.2 $RPM_BUILD_ROOT%{atilibdir}/libGL.so
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so.1
+ln -s libfglrx_dm.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libfglrx_dm.so
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so.1
+ln -s libAMDXvBA.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libAMDXvBA.so
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so.1
+ln -s libXvBAW.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libXvBAW.so
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so.1
+ln -s libatiuki.so.1.0 $RPM_BUILD_ROOT%{atilibdir}/libatiuki.so
install -D -p -m 0644 fglrxpkg/usr/share/icons/ccc_large.xpm $RPM_BUILD_ROOT/%{_datadir}/icons/ccc_large.xpm
install -D -p -m 0755 %{SOURCE3} $RPM_BUILD_ROOT%{_sbindir}/catalyst-config-display
@@ -282,17 +291,28 @@
chrpath --delete $RPM_BUILD_ROOT%{_bindir}/amdcccle
chrpath --delete $RPM_BUILD_ROOT%{_sbindir}/amdnotifyui
+# ld.so.conf.d file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
+
+
%clean
rm -rf $RPM_BUILD_ROOT
%post
-# Update the user's version numbers in the AMD Control Center. Replacement
-# values can be obtained by executing:
-# cat fglrxpkg/etc/ati/amdpcsdb.default | grep -i version
+# Update the user's version numbers in the AMD Control Center.
if [ -f %{_sysconfdir}/amdpcsdb ];then
- sed -i -e 's|ReleaseVersion=.*|S8.892-110914m-125703C-ATI|' %{_sysconfdir}/amdpcsdb
- sed -i -e 's|Catalyst_Version=.*|S11.9|' %{_sysconfdir}/amdpcsdb
+ ReleaseVersion=$(sed '/ReleaseVersion=S/!d; s/ReleaseVersion=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${ReleaseVersion}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,ReleaseVersion >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,ReleaseVersion,${ReleaseVersion} >/dev/null 2>&1
+ fi
+ Catalyst_Version=$(sed '/Catalyst_Version=S/!d; s/Catalyst_Version=S//' %{_sysconfdir}/ati/amdpcsdb.default 2>/dev/null)
+ if [ -n "${Catalyst_Version}" ]; then
+ %{_bindir}/aticonfig --del-pcs-key=LDC,Catalyst_Version >/dev/null 2>&1
+ %{_bindir}/aticonfig --set-pcs-str=LDC,Catalyst_Version,${Catalyst_Version} >/dev/null 2>&1
+ fi
fi ||:
if [ "${1}" -eq 1 ]; then
@@ -301,7 +321,8 @@
# Add init script(s) and start it
/sbin/chkconfig --add catalyst
/sbin/chkconfig --add atieventsd
- /etc/init.d/catalyst start &>/dev/null
+ /sbin/service catalyst start >/dev/null 2>&1
+ /sbin/service atieventsd start >/dev/null 2>&1
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='radeon.modeset=0' &>/dev/null
@@ -360,6 +381,7 @@
%files libs
%defattr(-,root,root,-)
+%ghost %{_sysconfdir}/ld.so.conf.d/catalyst-%{_lib}.conf
%dir %{atilibdir}
%{atilibdir}/*.so*
%{_libdir}/dri/
@@ -367,10 +389,22 @@
%files devel
%defattr(-,root,root,-)
%doc fglrxpkg/usr/src/ati/fglrx_sample_source.tgz
+%doc amdxvba/doc/AMD_XvBA_Spec_v0_74_01_AES_2.pdf
+%doc amdxvba/AMD_XvBA_LICENSE amdxvba/AMD_XvBA_README
%{atilibdir}/*.a
%{_includedir}/fglrx/
+# enumerate development symlinks
+%{atilibdir}/libGL.so
+%{atilibdir}/libfglrx_dm.so
+%{atilibdir}/libAMDXvBA.so
+%{atilibdir}/libXvBAW.so
+%{atilibdir}/libatiuki.so
%changelog
+* Fri Nov 04 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 11.9-3
+- Various fixes from rfbz#1965
+- Ghost catalyst libraries directory in ld.so.conf.d
+
* Fri Oct 28 2011 Stewart Adam <s.adam at diffingo.com> 11.9-2
- Fix several packaging bugs (#1932, #1965)
12 years, 6 months
rpms/broadcom-wl/devel 5_100_82_38.patch, NONE, 1.1 broadcom-wl-5.100.82.38-license.patch, NONE, 1.1 broadcom-wl.spec, 1.11, 1.12 sources, 1.10, 1.11 .cvsignore, 1.9, 1.10 dead.package, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7922
Modified Files:
.cvsignore
Added Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
broadcom-wl.spec sources
Removed Files:
dead.package
Log Message:
* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
- Updated version to 5.100.82.38
5_100_82_38.patch:
wl_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE 5_100_82_38.patch ---
#
# Patch for Broadcom 80211 (STA) driver 5.100.82.38
# Fixes the 'init_MUTEX' compile problem seen on newer (> 2.6.37) kernels.
# If you were able to compile, you don't need this patch.
# To apply:
# cd to the top level of the driver source. ('ls' should show at least src, lib, Makefile)
# patch -p0 < this_file
# make
#
--- src/wl/sys/wl_linux.c 2011-05-20 12:07:25.303356739 -0700
+++ src/wl/sys/wl_linux.c.new 2011-05-20 12:07:13.663356735 -0700
@@ -481,9 +481,9 @@
if (WL_ALL_PASSIVE_ENAB(wl)) {
#ifdef WL_ALL_PASSIVE
spin_lock_init(&wl->txq_lock);
#endif
- init_MUTEX(&wl->sem);
+ sema_init(&wl->sem, 1);
}
if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,
osh, wl->regsva, wl->bcm_bustype, btparam, &err))) {
broadcom-wl-5.100.82.38-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.38-license.patch ---
diff -Naur --recursive hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c 2010-12-15 01:58:07.000000000 +0000
+++ hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c 2011-01-27 22:33:05.899146588 +0000
@@ -180,6 +180,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: broadcom-wl.spec
===================================================================
RCS file: broadcom-wl.spec
diff -N broadcom-wl.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ broadcom-wl.spec 4 Nov 2011 01:39:32 -0000 1.12
@@ -0,0 +1,94 @@
+Name: broadcom-wl
+Version: 5.100.82.38
+Release: 1%{?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://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source2: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R...
+Source3: broadcom-wl-blacklist.conf
+Source4: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b...
+Patch0: broadcom-wl-5.100.82.38-license.patch
+Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
+
+BuildArch: noarch
+Provides: wl-kmod-common = %{version}
+Requires: wl-kmod >= %{version}
+
+ExcludeArch: ppc ppc64
+
+%description
+This package contains the license, README.txt and configuration
+files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
+device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
+BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and
+BCM43228-based hardware.
+
+%prep
+%setup -q -c
+iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
+sed -i 's/\r$//' lib/LICENSE.txt
+cp -p %{SOURCE2} %{SOURCE4} .
+chmod 644 lib/LICENSE.txt README.txt bcma.txt
+%patch0 -p1 -b .license
+%patch1 -p0 -b .init_MUTEX
+
+%build
+echo "Nothing to build."
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc lib/LICENSE.txt README.txt bcma.txt
+%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
+
+%changelog
+* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
+- Updated version to 5.100.82.38
+
+* Tue Feb 01 2011 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36
+- updated version to 5.100.82.38
+
+* Mon Feb 22 2010 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36-1
+- updated version to 5.60.48.36
+
+* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3
+- updated to 5.10.91.9.3
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2
+- rebuild for new F11 features
+
+* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
+- update version to 5.10.79.10
+
+* Sun Feb 01 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.27.14-1
+- update version to 5.10.27.14
+
+* Sun Jan 04 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.27.12-1
+- Update version to 5.10.27.12
+
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
+* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4
+- ExcludeArch ppc, ppc64
+
+* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-3
+- Updated README.txt file
+- Cleaned up spec file
+
+* Sun Nov 02 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-2
+- Added README.txt file
+- Added /etc/modprobe.d/broadcom-wl-blacklist
+
+* Thu Oct 30 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-1
+- Initial Build
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 4 Nov 2011 01:39:34 -0000 1.11
@@ -0,0 +1,5 @@
+cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
+c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+24976921c7b8854ed2cd56fbc5b1c13c README.txt
+521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt
+7b6a8f3ca263a3bb2e49124ade3cf010 broadcom-wl-blacklist.conf
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 1 Feb 2011 22:29:12 -0000 1.9
+++ .cvsignore 4 Nov 2011 01:39:31 -0000 1.10
@@ -1,3 +1,5 @@
+hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
README.txt
+bcma.txt
broadcom-wl-blacklist.conf
--- dead.package DELETED ---
12 years, 6 months
rpms/broadcom-wl/F-16 5_100_82_38.patch, NONE, 1.1 broadcom-wl-5.100.82.38-license.patch, NONE, 1.1 broadcom-wl.spec, 1.11, 1.12 sources, 1.10, 1.11 .cvsignore, 1.9, 1.10 dead.package, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15814
Modified Files:
.cvsignore
Added Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
broadcom-wl.spec sources
Removed Files:
dead.package
Log Message:
* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
- Updated version to 5.100.82.38
5_100_82_38.patch:
wl_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE 5_100_82_38.patch ---
#
# Patch for Broadcom 80211 (STA) driver 5.100.82.38
# Fixes the 'init_MUTEX' compile problem seen on newer (> 2.6.37) kernels.
# If you were able to compile, you don't need this patch.
# To apply:
# cd to the top level of the driver source. ('ls' should show at least src, lib, Makefile)
# patch -p0 < this_file
# make
#
--- src/wl/sys/wl_linux.c 2011-05-20 12:07:25.303356739 -0700
+++ src/wl/sys/wl_linux.c.new 2011-05-20 12:07:13.663356735 -0700
@@ -481,9 +481,9 @@
if (WL_ALL_PASSIVE_ENAB(wl)) {
#ifdef WL_ALL_PASSIVE
spin_lock_init(&wl->txq_lock);
#endif
- init_MUTEX(&wl->sem);
+ sema_init(&wl->sem, 1);
}
if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,
osh, wl->regsva, wl->bcm_bustype, btparam, &err))) {
broadcom-wl-5.100.82.38-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.38-license.patch ---
diff -Naur --recursive hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c 2010-12-15 01:58:07.000000000 +0000
+++ hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c 2011-01-27 22:33:05.899146588 +0000
@@ -180,6 +180,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: broadcom-wl.spec
===================================================================
RCS file: broadcom-wl.spec
diff -N broadcom-wl.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ broadcom-wl.spec 4 Nov 2011 01:17:01 -0000 1.12
@@ -0,0 +1,94 @@
+Name: broadcom-wl
+Version: 5.100.82.38
+Release: 1%{?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://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source2: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R...
+Source3: broadcom-wl-blacklist.conf
+Source4: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b...
+Patch0: broadcom-wl-5.100.82.38-license.patch
+Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
+
+BuildArch: noarch
+Provides: wl-kmod-common = %{version}
+Requires: wl-kmod >= %{version}
+
+ExcludeArch: ppc ppc64
+
+%description
+This package contains the license, README.txt and configuration
+files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
+device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
+BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and
+BCM43228-based hardware.
+
+%prep
+%setup -q -c
+iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
+sed -i 's/\r$//' lib/LICENSE.txt
+cp -p %{SOURCE2} %{SOURCE4} .
+chmod 644 lib/LICENSE.txt README.txt bcma.txt
+%patch0 -p1 -b .license
+%patch1 -p0 -b .init_MUTEX
+
+%build
+echo "Nothing to build."
+
+%install
+rm -rf $RPM_BUILD_ROOT
+mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root,-)
+%doc lib/LICENSE.txt README.txt bcma.txt
+%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
+
+%changelog
+* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
+- Updated version to 5.100.82.38
+
+* Tue Feb 01 2011 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36
+- updated version to 5.100.82.38
+
+* Mon Feb 22 2010 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36-1
+- updated version to 5.60.48.36
+
+* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.91.9.3
+- updated to 5.10.91.9.3
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2
+- rebuild for new F11 features
+
+* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.79.10-1
+- update version to 5.10.79.10
+
+* Sun Feb 01 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.27.14-1
+- update version to 5.10.27.14
+
+* Sun Jan 04 2009 Chris Nolan <chris(a)cenolan.com> - 5.10.27.12-1
+- Update version to 5.10.27.12
+
+* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.11-1
+- Update version to 5.10.27.11
+
+* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4
+- ExcludeArch ppc, ppc64
+
+* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-3
+- Updated README.txt file
+- Cleaned up spec file
+
+* Sun Nov 02 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-2
+- Added README.txt file
+- Added /etc/modprobe.d/broadcom-wl-blacklist
+
+* Thu Oct 30 2008 Chris Nolan <chris(a)cenolan.com> 5.10.27.6-1
+- Initial Build
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 4 Nov 2011 01:17:01 -0000 1.11
@@ -0,0 +1,5 @@
+cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
+c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
+24976921c7b8854ed2cd56fbc5b1c13c README.txt
+521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt
+7b6a8f3ca263a3bb2e49124ade3cf010 broadcom-wl-blacklist.conf
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-16/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 1 Feb 2011 22:29:12 -0000 1.9
+++ .cvsignore 4 Nov 2011 01:17:01 -0000 1.10
@@ -1,3 +1,5 @@
+hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
README.txt
+bcma.txt
broadcom-wl-blacklist.conf
--- dead.package DELETED ---
12 years, 6 months
rpms/wl-kmod/F-15 5_100_82_38.patch, NONE, 1.1 broadcom-wl-5.100.82.38-license.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sources, 1.9, 1.10 wl-kmod.spec, 1.63, 1.64 broadcom-wl-5.60.48.36-2.6.33-kernel.patch, 1.1, NONE broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch, 1.1, NONE broadcom-wl-5.60.48.36-license.patch, 1.1, NONE broadcom-wl-5.60.48.36-multicast-kernel.patch, 1.1, NONE
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/wl-kmod/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9788
Modified Files:
.cvsignore sources wl-kmod.spec
Added Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Removed Files:
broadcom-wl-5.60.48.36-2.6.33-kernel.patch
broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch
broadcom-wl-5.60.48.36-license.patch
broadcom-wl-5.60.48.36-multicast-kernel.patch
Log Message:
* Thu Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
- Updated version to 5.100.82.38
5_100_82_38.patch:
wl_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE 5_100_82_38.patch ---
#
# Patch for Broadcom 80211 (STA) driver 5.100.82.38
# Fixes the 'init_MUTEX' compile problem seen on newer (> 2.6.37) kernels.
# If you were able to compile, you don't need this patch.
# To apply:
# cd to the top level of the driver source. ('ls' should show at least src, lib, Makefile)
# patch -p0 < this_file
# make
#
--- src/wl/sys/wl_linux.c 2011-05-20 12:07:25.303356739 -0700
+++ src/wl/sys/wl_linux.c.new 2011-05-20 12:07:13.663356735 -0700
@@ -481,9 +481,9 @@
if (WL_ALL_PASSIVE_ENAB(wl)) {
#ifdef WL_ALL_PASSIVE
spin_lock_init(&wl->txq_lock);
#endif
- init_MUTEX(&wl->sem);
+ sema_init(&wl->sem, 1);
}
if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,
osh, wl->regsva, wl->bcm_bustype, btparam, &err))) {
broadcom-wl-5.100.82.38-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.38-license.patch ---
diff -Naur --recursive hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c 2010-12-15 01:58:07.000000000 +0000
+++ hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c 2011-01-27 22:33:05.899146588 +0000
@@ -180,6 +180,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 22 Feb 2010 23:03:46 -0000 1.9
+++ .cvsignore 4 Nov 2011 00:42:42 -0000 1.10
@@ -1,3 +1,3 @@
-hybrid-portsrc-x86_32-v5.60.48.36.tar.gz
-hybrid-portsrc-x86_64-v5.60.48.36.tar.gz
+hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
+hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
broadcom-wl-kmodtool-excludekernel-filterfile
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 22 Feb 2010 23:03:46 -0000 1.9
+++ sources 4 Nov 2011 00:42:47 -0000 1.10
@@ -1,3 +1,3 @@
-0466d863405e1ab99d5e288fe886e852 hybrid-portsrc-x86_32-v5.60.48.36.tar.gz
-a78095ddcc30a191f64dccbc31b84de8 hybrid-portsrc-x86_64-v5.60.48.36.tar.gz
+cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
+c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
5df50b59ac8a311c81c9ad569ffc2225 broadcom-wl-kmodtool-excludekernel-filterfile
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-15/wl-kmod.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- wl-kmod.spec 2 Nov 2011 10:18:48 -0000 1.63
+++ wl-kmod.spec 4 Nov 2011 00:42:47 -0000 1.64
@@ -3,28 +3,27 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
+%define buildforkernels current
+#define buildforkernels akmods
Name: wl-kmod
-Version: 5.60.48.36
-Release: 2%{?dist}.12
-Summary: Kernel module for broadcom wireless devices
+Version: 5.100.82.38
+Release: 1%{?dist}
+Summary: Kernel module for Broadcom wireless devices
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.60.48.36....
-Source1: http://www.broadcom.com/docs/linux_sta/hybrid-portsrc-x86_64-v5.60.48.36....
+Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
Source11: broadcom-wl-kmodtool-excludekernel-filterfile
-Patch0: broadcom-wl-5.60.48.36-license.patch
-Patch1: broadcom-wl-5.60.48.36-2.6.33-kernel.patch
-Patch2: broadcom-wl-5.60.48.36-multicast-kernel.patch
-Patch3: broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: broadcom-wl-5.100.82.38-license.patch
+Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
BuildRequires: %{_bindir}/kmodtool
# needed for plague to make sure it builds for i586 and i686
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
# ppc disabled because broadcom only provides x86 and x86_64 bits
%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
@@ -33,9 +32,9 @@
%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
%description
-These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux device
-driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and BCM4322
-based hardware.
+These packages contain Broadcom's IEEE 802.11a/b/g/n hybrid Linux device
+driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-, BCM4321-,
+BCM4322-, BCM43224-, and BCM43225-, BCM43227- and BCM43228-based hardware.
NOTE: You must read the LICENSE.txt file in the docs directory before using
this software.
@@ -56,9 +55,7 @@
tar xzf %{SOURCE1}
%endif
%patch0 -p1 -b .license
-%patch1 -p0 -b .kernel
-%patch2 -p0 -b .multicast
-%patch3 -p0 -b .lockdep
+%patch1 -p0 -b .init_MUTEX
popd
for kernel_version in %{?kernel_versions} ; do
@@ -77,17 +74,20 @@
for kernel_version in %{?kernel_versions}; do
pushd _kmod_build_${kernel_version%%___*}
mkdir -p ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
- install -m 644 *.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
+ install -m 755 *.ko ${RPM_BUILD_ROOT}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}
popd
done
-chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/* || :
+chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/*/* || :
%{?akmod_install}
%clean
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
+- Updated version to 5.100.82.38
+
* Wed Nov 02 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 5.60.48.36-2.12
- rebuild for updated kernel
--- broadcom-wl-5.60.48.36-2.6.33-kernel.patch DELETED ---
--- broadcom-wl-5.60.48.36-debug-lockdep-rcu-enabled.patch DELETED ---
--- broadcom-wl-5.60.48.36-license.patch DELETED ---
--- broadcom-wl-5.60.48.36-multicast-kernel.patch DELETED ---
12 years, 6 months
rpms/broadcom-wl/F-15 5_100_82_38.patch, NONE, 1.1 broadcom-wl-5.100.82.38-license.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 broadcom-wl-blacklist.conf, 1.1, 1.2 broadcom-wl.spec, 1.10, 1.11 sources, 1.9, 1.10
by Nicolas Viéville
Author: nvieville
Update of /cvs/nonfree/rpms/broadcom-wl/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2448
Modified Files:
.cvsignore broadcom-wl-blacklist.conf broadcom-wl.spec sources
Added Files:
5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch
Log Message:
* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
- Updated version to 5.100.82.38
5_100_82_38.patch:
wl_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE 5_100_82_38.patch ---
#
# Patch for Broadcom 80211 (STA) driver 5.100.82.38
# Fixes the 'init_MUTEX' compile problem seen on newer (> 2.6.37) kernels.
# If you were able to compile, you don't need this patch.
# To apply:
# cd to the top level of the driver source. ('ls' should show at least src, lib, Makefile)
# patch -p0 < this_file
# make
#
--- src/wl/sys/wl_linux.c 2011-05-20 12:07:25.303356739 -0700
+++ src/wl/sys/wl_linux.c.new 2011-05-20 12:07:13.663356735 -0700
@@ -481,9 +481,9 @@
if (WL_ALL_PASSIVE_ENAB(wl)) {
#ifdef WL_ALL_PASSIVE
spin_lock_init(&wl->txq_lock);
#endif
- init_MUTEX(&wl->sem);
+ sema_init(&wl->sem, 1);
}
if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,
osh, wl->regsva, wl->bcm_bustype, btparam, &err))) {
broadcom-wl-5.100.82.38-license.patch:
wl_linux.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE broadcom-wl-5.100.82.38-license.patch ---
diff -Naur --recursive hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c
--- hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c 2010-12-15 01:58:07.000000000 +0000
+++ hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c 2011-01-27 22:33:05.899146588 +0000
@@ -180,6 +180,8 @@
static void wl_report_radio_state(wl_info_t *wl);
#endif
+MODULE_LICENSE("MIXED/Proprietary");
+
static struct pci_device_id wl_id_table[] = {
{ PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
{ PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 1 Feb 2011 22:29:12 -0000 1.9
+++ .cvsignore 3 Nov 2011 23:41:40 -0000 1.10
@@ -1,3 +1,5 @@
+hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
README.txt
+bcma.txt
broadcom-wl-blacklist.conf
Index: broadcom-wl-blacklist.conf
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl-blacklist.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- broadcom-wl-blacklist.conf 19 Sep 2009 12:52:18 -0000 1.1
+++ broadcom-wl-blacklist.conf 3 Nov 2011 23:41:40 -0000 1.2
@@ -3,3 +3,4 @@
blacklist ssb
blacklist b43
blacklist ndiswrapper
+blacklist bcma
Index: broadcom-wl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/broadcom-wl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- broadcom-wl.spec 1 Feb 2011 22:29:12 -0000 1.10
+++ broadcom-wl.spec 3 Nov 2011 23:41:40 -0000 1.11
@@ -5,29 +5,35 @@
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_38...
-Source1: http://www.broadcom.com/docs/linux_sta/README.txt
-Source2: broadcom-wl-blacklist.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h...
+Source2: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R...
+Source3: broadcom-wl-blacklist.conf
+Source4: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b...
+Patch0: broadcom-wl-5.100.82.38-license.patch
+Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5...
BuildArch: noarch
Provides: wl-kmod-common = %{version}
Requires: wl-kmod >= %{version}
-ExcludeArch: ppc ppc64
+ExcludeArch: ppc ppc64
%description
-This package contains the license, readme and configuration files
-for the Broadcom 802.11 Linux STA Driver for WiFi, a linux device
-driver for use with Broadcom's BCM4311-, BCM4312-, BCM4321-, and
-BCM4322-based hardware.
+This package contains the license, README.txt and configuration
+files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux
+device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-,
+BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and
+BCM43228-based hardware.
%prep
%setup -q -c
iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt
sed -i 's/\r$//' lib/LICENSE.txt
-cp -p %{SOURCE1} .
-chmod 644 lib/LICENSE.txt README.txt
+cp -p %{SOURCE2} %{SOURCE4} .
+chmod 644 lib/LICENSE.txt README.txt bcma.txt
+%patch0 -p1 -b .license
+%patch1 -p0 -b .init_MUTEX
%build
echo "Nothing to build."
@@ -35,17 +41,20 @@
%install
rm -rf $RPM_BUILD_ROOT
mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
-install -p -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
+install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
-%doc lib/LICENSE.txt README.txt
+%doc lib/LICENSE.txt README.txt bcma.txt
%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf
%changelog
+* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr> - 5.100.82.38-1
+- Updated version to 5.100.82.38
+
* Tue Feb 01 2011 Chris Nolan <chris(a)cenolan.com> - 5.60.48.36
- updated version to 5.100.82.38
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/broadcom-wl/F-15/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 1 Feb 2011 22:29:12 -0000 1.9
+++ sources 3 Nov 2011 23:41:40 -0000 1.10
@@ -1,3 +1,5 @@
+cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz
c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz
24976921c7b8854ed2cd56fbc5b1c13c README.txt
-5eb025e4c25f9fdaa7ae809652c66173 broadcom-wl-blacklist.conf
+521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt
+5a38b3910b18d96922b769746bf2d3ee broadcom-wl-blacklist.conf
12 years, 6 months