- fixed build (tested with kernel-module-build-2.6.5-1)

[packages/acx.git] / acx.spec

diff --git a/acx.spec b/acx.spec
index a34ed3a42641b3a76e70820465e0a28cf53283a8..11ea4f84c99a4c0d570a1a2ad433ac9050ff339d 100644 (file)
--- a/acx.spec
+++ b/acx.spec
@@ -1,25 +1,22 @@
 #
 # Conditional build:
-# _without_dist_kernel          without distribution kernel
+%bcond_without dist_kernel     # without distribution kernel
 #
-# TODO:
-# - UP/SMP scheme, pass CC and CFLAGS
-%define                _orig_name      acx100_pci
-
+%define                no_install_post_compress_modules        1
 Summary:       Linux driver for WLAN card base on ACX100
 Summary(pl):   Sterownik dla Linuksa do kart bezprzewodowych na uk³adzie ACX100
 Name:          kernel-net-acx100
-Version:       0.2.0pre4
-%define        _rel    0.4
+Version:       0.2.0pre8
+%define        _rel    1
 Release:       %{_rel}@%{_kernel_ver_str}
-License:       GPL
+License:       MPL or GPL
 Group:         Base/Kernel
 Source0:       http://rhlx01.fht-esslingen.de/~andi/acx100/acx100-%{version}.tar.bz2
-# Source0-md5: cc4e97d866116af36f24b1c52db8e4a8
+# Source0-md5: 489314f0dd48da036de1e94475bc1304
 URL:           http://acx100.sourcefroge.net/index.html
-%{!?_without_dist_kernel:BuildRequires:        kernel-headers >= 2.4.0}}
+%{?with_dist_kernel:BuildRequires:     kernel-module-build >= 2.6.0}
+BuildRequires: %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.118
-%{!?_without_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun): /sbin/depmod
 Obsoletes:     kernel-net-acx100
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -30,16 +27,55 @@ This is driver for WLAN card based on ACX100 for Linux.
 %description -l pl
 Sterownik dla Linuksa do kart WLAN opartych o uk³ad ACX100.
 
+%package -n kernel-smp-net-acx100
+Summary:       Linux SMP driver for WLAN card base on ACX100
+Summary(pl):   Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100
+Group:         Base/Kernel
+Requires(post,postun): /sbin/depmod
+
+%description -n kernel-smp-net-acx100
+Linux SMP driver for WLAN card base on ACX100.
+
+%description -n kernel-smp-net-acx100 -l pl
+Sterownik dla Linuksa SMP do kart bezprzewodowych na uk³adzie ACX100.
+
 %prep
-%setup -q -c
+%setup -q -n acx100-%{version}
 
 %build
-%{__make} -C acx100-%{version}
+cd src
+mv Makefile2.6 Makefile
+ln -sf %{_kernelsrcdir}/config-up .config
+rm -rf include
+install -d include/{linux,config}
+cp ../include/* .
+ln -s %{_kernelsrcdir}/include/linux/autoconf-up.h include/linux/autoconf.h
+ln -s %{_kernelsrcdir}/include/asm-%{_arch} include/asm
+touch include/config/MARKER
+%{__make} -C %{_kernelsrcdir} modules \
+       SUBDIRS=$PWD \
+       O=$PWD \
+       V=1
+
+mv acx_pci.ko acx_pci.ko-done
+
+#% %{__make} -C %{_kernelsrcdir} SUBDIRS=$PWD O=$PWD V=1 mrproper
+
+#ln -sf %{_kernelsrcdir}/config-smp .config
+#rm -rf include
+#install -d include/{linux,config}
+#cp ../include/* include/
+#ln -s %{_kernelsrcdir}/include/linux/autoconf-smp.h include/linux/autoconf.h
+#ln -s %{_kernelsrcdir}/include/asm-%{_arch} include/asm
+#touch include/config/MARKER
+#%%{__make} -C %{_kernelsrcdir} SUBDIRS=$PWD O=$PWD V=1 modules
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
-install acx100-0.2.0pre3/src/%{_orig_name}.o $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/%{_orig_name}.o
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
+
+install src/acx_pci.ko-done $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/acx_pci.ko
+#install src/acx100_pci.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/acx100_pci.ko
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,7 +86,18 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %depmod %{_kernel_ver}
 
+%post  -n kernel-smp-net-acx100
+%depmod %{_kernel_ver}smp
+
+%postun        -n kernel-smp-net-acx100
+%depmod %{_kernel_ver}smp
+
 %files
 %defattr(644,root,root,755)
-#%doc readme
+%doc ChangeLog README TODO doc/*
 /lib/modules/%{_kernel_ver}/misc/*
+
+#%files -n kernel-smp-net-acx100
+#%defattr(644,root,root,755)
+#%doc ChangeLog README TODO doc/*
+#/lib/modules/%{_kernel_ver}smp/misc/*.ko