- rel 4; with 2.6.30 patch

[packages/acx.git] / acx.spec

diff --git a/acx.spec b/acx.spec
index 0d50a3ca721780a43fe1b7166b702da1bd2ad415..bf2a36caa68c0186ee36b0f37b47be908017cc7f 100644 (file)
--- a/acx.spec
+++ b/acx.spec
@@ -1,66 +1,56 @@
 # TODO:
-# - spec filename vs Name
 # - add firmware download?
 #
 # Conditional build:
 %bcond_without dist_kernel     # without distribution kernel
-%bcond_without smp             # don't build SMP module
-#
-%ifarch sparc
-%undefine      with_smp
-%endif
 #
 Summary:       Linux driver for WLAN card base on ACX100/ACX111
-Summary(pl):   Sterownik dla Linuksa do kart bezprzewodowych na uk³adzie ACX100/ACX111
+Summary(pl.UTF-8):     Sterownik dla Linuksa do kart bezprzewodowych na układzie ACX100/ACX111
 Name:          acx
 Version:       20070101
-%define        _rel    1
+%define        _rel    4
 Release:       %{_rel}
 License:       MPL or GPL
 Group:         Base/Kernel
 Source0:       http://www.cmartin.tk/acx/%{name}-%{version}.tar.bz2
 # Source0-md5: ec6322b9c82781897a9433ef0cefda6f
+Patch0:                %{name}-skb.patch
+# based on https://dev.openwrt.org/browser/trunk/package/acx/patches/003-2.6.24-compat.diff?rev=10425&format=txt
+Patch1:                %{name}-2.6.24.patch
+Patch2:                %{name}-2.6.29.patch
+Patch3:                %{name}-2.6.30.patch
 URL:           http://acx100.sourceforge.net/
-%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.16}
-BuildRequires: rpmbuild(macros) >= 1.330
+%{?with_dist_kernel:BuildRequires:     kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
+BuildRequires: rpmbuild(macros) >= 1.379
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 This is driver for WLAN card based on ACX100/ACX111 for Linux.
 
-%description -l pl
-Sterownik dla Linuksa do kart WLAN opartych o uk³ad ACX100/ACX111.
+%description -l pl.UTF-8
+Sterownik dla Linuksa do kart WLAN opartych o układ ACX100/ACX111.
 
-%package -n kernel%{_alt_kernel}-net-acx100
+%package -n kernel%{_alt_kernel}-net-acx
 Summary:       Linux driver for WLAN card base on ACX100/ACX111
-Summary(pl):   Sterownik dla Linuksa do kart bezprzewodowych na uk³adzie ACX100/ACX111
+Summary(pl.UTF-8):     Sterownik dla Linuksa do kart bezprzewodowych na układzie ACX100/ACX111
 Release:       %{_rel}@%{_kernel_ver_str}
 Group:         Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun): /sbin/depmod
+Obsoletes:     kernel%{_alt_kernel}-net-acx100
 
-%description -n kernel%{_alt_kernel}-net-acx100
+%description -n kernel%{_alt_kernel}-net-acx
 This is driver for WLAN card based on ACX100/ACX111 for Linux.
 
-%description -n kernel%{_alt_kernel}-net-acx100 -l pl
-Sterownik dla Linuksa do kart WLAN opartych o uk³ad ACX100/ACX111.
-
-%package -n kernel%{_alt_kernel}-smp-net-acx100
-Summary:       Linux SMP driver for WLAN card base on ACX100/ACX111
-Summary(pl):   Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100/ACX111
-Release:       %{_rel}@%{_kernel_ver_str}
-Group:         Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun): /sbin/depmod
-
-%description -n kernel%{_alt_kernel}-smp-net-acx100
-Linux SMP driver for WLAN card base on ACX100/ACX111.
-
-%description -n kernel%{_alt_kernel}-smp-net-acx100 -l pl
-Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100/ACX111.
+%description -n kernel%{_alt_kernel}-net-acx -l pl.UTF-8
+Sterownik dla Linuksa do kart WLAN opartych o układ ACX100/ACX111.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %build_kernel_modules -m acx
@@ -73,26 +63,13 @@ rm -rf $RPM_BUILD_ROOT
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -n kernel%{_alt_kernel}-net-acx100
+%post  -n kernel%{_alt_kernel}-net-acx
 %depmod %{_kernel_ver}
 
-%postun        -n kernel%{_alt_kernel}-net-acx100
+%postun        -n kernel%{_alt_kernel}-net-acx
 %depmod %{_kernel_ver}
 
-%post  -n kernel%{_alt_kernel}-smp-net-acx100
-%depmod %{_kernel_ver}smp
-
-%postun        -n kernel%{_alt_kernel}-smp-net-acx100
-%depmod %{_kernel_ver}smp
-
-%files -n kernel%{_alt_kernel}-net-acx100
+%files -n kernel%{_alt_kernel}-net-acx
 %defattr(644,root,root,755)
 %doc Changelog README
 /lib/modules/%{_kernel_ver}/misc/*.ko*
-
-%if %{with smp}
-%files -n kernel%{_alt_kernel}-smp-net-acx100
-%defattr(644,root,root,755)
-%doc Changelog README
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif