- pointless fpmath removed.

[packages/atmelwlandriver.git] / atmelwlandriver.spec

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index cee8d1eba322fa17c84047d0e47cd6849938e2cf..0b20d6f4acf9d1e26d01e918438754e03d8034d9 100644 (file)
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -5,31 +5,35 @@
 %bcond_without userspace       # don't build userspace applications
 %bcond_with    verbose         # verbose build (V=1)
 #
+# TODO:
+#      - X11 tools
+#
 Summary:       Linux driver for WLAN card based on AT76C5XXx
 Summary(pl):   Sterownik dla Linuxa do kart WLAN opartych na uk³adzie AT76C5XXx
 Name:          kernel-net-atmelwlandriver
-Version:       3.3.5.5
+Version:       3.3.5.6
 %define                _rel    0.1
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
 Source0:       http://dl.sourceforge.net/sourceforge/atmelwlandriver/atmelwlandriver-%{version}.tar.bz2
-# Source0-md5: 4248ff3f0a0d7d3f83d02cb540bff6f9
+# Source0-md5: dd9a11d175ba0fbb62cf7fec5426f5de
 Source1:       atmelwlandriver.config
 # Patch0:              atmelwlandriver-makefile.patch
 Patch1:                atmelwlandriver-etc.patch
+Patch2:                atmelwlandriver-fpmath.patch
 URL:           http://atmelwlandriver.sourceforge.net
-BuildRequires: rpmbuild(macros) >= 1.118
+BuildRequires: rpmbuild(macros) >= 1.153
 BuildRequires: %{kgcc_package}
 %if %{with kernel} && %{with dist_kernel}
-BuildRequires: kernel-module-build
+BuildRequires: kernel-module-build >= 2.6.7
 BuildRequires: kernel-source
 %endif
 %if %{with userspace}
 BuildRequires: ncurses-devel
-BuildRequires: wxWindows-devel >= 2.4.0
-BuildRequires: wxGTK-devel >= 2.4.0
-BuildRequires: xforms-devel
+#BuildRequires:        wxWindows-devel >= 2.4.0
+#BuildRequires:        wxGTK-devel >= 2.4.0
+#BuildRequires:        xforms-devel
 %endif
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires:      wireless-tools
@@ -85,8 +89,9 @@ pracy.
 
 %prep
 %setup -q -n atmelwlandriver
-#%%patch0 -p1
+#patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp -f Makefile{.kernelv2.6,}
@@ -103,6 +108,7 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
     install -d include/{linux,config}
     ln -sf %{_kernelsrcdir}/config-$cfg .config
     ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h include/linux/autoconf.h
+    ln -sf %{_kernelsrcdir}/include/asm-%{_target_base_arch} include/asm
     touch include/config/MARKER
     %{__make} -C %{_kernelsrcdir} clean \
        RCS_FIND_IGNORE="-name '*.ko' -o" \
@@ -123,7 +129,7 @@ done
 #        make winter             - compile winter utility - ( CAUTION : MUST have wxwindows installed )
 #        make install            - install modules and programs
 
-%{__make} lvnet INC="%{_includedir}/ncurses -I../winter"
+%{__make} lvnet INC="%{_includedir}/ncurses -I../../includes"
 
 #%{?with_apps:echo "CONFIG_APPS=y" >> .config}
 #%{__make} all \
@@ -133,6 +139,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sbindir}
 
 %if %{with kernel}
 cd built
@@ -148,17 +155,17 @@ install smp/usb* \
        $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net
 %endif
 cd -
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/pcmcia
+cp scripts/atmel.conf $RPM_BUILD_ROOT%{_sysconfdir}/pcmcia
+cp scripts/fastvnet.sh $RPM_BUILD_ROOT%{_sbindir}
 %endif
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/pcmcia,%{_mandir}/man1}
-cp scripts/atmel.conf $RPM_BUILD_ROOT%{_sysconfdir}/pcmcia
-cp scripts/fastvnet.sh $RPM_BUILD_ROOT%{_bindir}
+%if %{with userspace}
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
 #mv -f scripts/.vnetrc $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
-
-#%{__make} install \
-#      DESTDIR=$RPM_BUILD_ROOT%{_prefix} \
-#        MODDIR=$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver} \
-#      MAN_PATH=$RPM_BUILD_ROOT%{_mandir}/man1
+install man/lvnet.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install src/apps/cmd_line/lvnet $RPM_BUILD_ROOT%{_sbindir}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -199,7 +206,7 @@ done
 %doc CHANGES README
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pcmcia/atmel.conf
 #%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
-%attr(755,root,root) %{_bindir}/fastvnet.sh
+%attr(755,root,root) %{_sbindir}/fastvnet.sh
 /lib/modules/%{_kernel_ver}/kernel/drivers/net/pcmcia/*.ko*
 /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/*.ko*
 
@@ -209,7 +216,7 @@ done
 %doc CHANGES README
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pcmcia/atmel.conf
 #%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
-%attr(755,root,root) %{_bindir}/fastvnet.sh
+%attr(755,root,root) %{_sbindir}/fastvnet.sh
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/net/pcmcia/*.ko*
 /lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/*.ko*
 %endif
@@ -218,6 +225,6 @@ done
 %if %{with userspace}
 %files -n atmelwlandriver-tools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/lvnet
 %{_mandir}/man1/*
 %endif