X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=atmelwlandriver.spec;h=82d2b27ded4e82133141b9a6a7c83074bd55bf33;hb=dd720771e3854ce2e82038b3f9f372197c1a4fe3;hp=2f5686b1348bf1eb93b68c719f10de1bbaa9b229;hpb=f4d82485ddae4d9fd5b042b37918e89f15508721;p=packages%2Fatmelwlandriver.git

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index 2f5686b..82d2b27 100644
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -1,3 +1,4 @@
+#
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
@@ -6,24 +7,25 @@
 %bcond_with	verbose		# verbose build (V=1)
 #
 # TODO:
-# 	- X11 tools
+#		- src/apps/fw-upgrade/fucd
 #
 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.6
-%define		_rel	0.2
+%define		_rel	0.5
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://dl.sourceforge.net/sourceforge/atmelwlandriver/atmelwlandriver-%{version}.tar.bz2
 # Source0-md5:	dd9a11d175ba0fbb62cf7fec5426f5de
-Source1:	atmelwlandriver.config
-# Patch0:		atmelwlandriver-makefile.patch
+Source1:	atmelwlandriver-vnetrc
+Patch0:		atmelwlandriver-makefile.patch
 Patch1:		atmelwlandriver-etc.patch
 Patch2:		atmelwlandriver-fpmath.patch
 Patch3:		atmelwlandriver-delay.patch
 Patch4:		atmelwlandriver-usb_defctrl.patch
+Patch5:		atmelwlandriver-winter-makefile.patch
 URL:		http://atmelwlandriver.sourceforge.net
 BuildRequires:	rpmbuild(macros) >= 1.153
 BuildRequires:	%{kgcc_package}
@@ -32,9 +34,10 @@ BuildRequires:	kernel-module-build >= 2.6.7
 BuildRequires:	kernel-source
 %endif
 %if %{with userspace}
+BuildRequires:	libusb-devel
 BuildRequires:	ncurses-devel
-#BuildRequires:	wxWindows-devel >= 2.4.0
-#BuildRequires:	wxGTK-devel >= 2.4.0
+BuildRequires:	wxWindows-devel >= 2.4.0
+BuildRequires:	wxGTK-devel >= 2.4.0
 #BuildRequires:	xforms-devel
 %endif
 %{?with_dist_kernel:%requires_releq_kernel_up}
@@ -91,14 +94,15 @@ pracy.
 
 %prep
 %setup -q -n atmelwlandriver
-#patch0 -p1
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
-cp -f Makefile{.kernelv2.6,}
+ln -sf Makefile.kernelv2.6 Makefile
 
 %if %{with kernel}
 # kernel module(s)
@@ -119,9 +123,11 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
 	M=$PWD O=$PWD \
 	%{?with_verbose:V=1}
     %{__make} pcmcia buildonly=release \
+	KERNEL_VERSION=%{__kernel_ver} \
 	M=$PWD O=$PWD \
 	%{?with_verbose:V=1}
     %{__make} usb buildonly=release \
+	KERNEL_VERSION=%{__kernel_ver} \
 	M=$PWD O=$PWD \
 	%{?with_verbose:V=1}
     mv -f objs/*/release/*.ko built/$cfg
@@ -129,16 +135,15 @@ done
 %endif
 
 %if %{with userspace}
-#        make lvnet              - compile lvnet utility
-#        make winter             - compile winter utility - ( CAUTION : MUST have wxwindows installed )
-#        make install            - install modules and programs
+%{__make} winter \
+	OPT="%{rpmcflags}"
 
-%{__make} lvnet INC="%{_includedir}/ncurses -I../../includes"
+%{__make} lvnet \
+	OPT="%{rpmcflags} %{rpmldflags}"
 
-#%{?with_apps:echo "CONFIG_APPS=y" >> .config}
-#%{__make} all \
-#	KCFLAGS="$KCFLAGS" \
-#	OPT="%{rpmcflags}" \
+%{__make} -C src/apps/fw-upgrade atmelup \
+	CCC=%{__cc} \
+	CCFLAGS="%{rpmcflags}"
 %endif
 
 %install
@@ -166,9 +171,11 @@ cp scripts/fastvnet.sh $RPM_BUILD_ROOT%{_sbindir}
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_mandir}/man1
-#mv -f scripts/.vnetrc $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
 install man/lvnet.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install src/apps/fw-upgrade/atmelup $RPM_BUILD_ROOT%{_sbindir}
 install src/apps/cmd_line/lvnet $RPM_BUILD_ROOT%{_sbindir}
+install objs/winter $RPM_BUILD_ROOT%{_sbindir}
 %endif
 
 %clean
@@ -178,9 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 for i in /lib/modules/%{_kernel_ver}/kernel/drivers/usb/net/usbvnet* ; do
     cuted_i=$(basename $i|cut -d. -f1)
     if  [ -f $i ]; then
-	if ( grep $cuted_i /etc/modules.conf >/dev/null ); then
+	if ( grep $cuted_i /etc/modprobe.conf >/dev/null ); then
 	    echo "NOP" >/dev/null; else
-		echo "#post-install $cuted_i /bin/fastvnet.sh">> /etc/modules.conf;
+		echo "#post-install $cuted_i /usr/sbin/fastvnet.sh">> /etc/modprobe.conf;
 	fi
     fi
 done
@@ -193,9 +200,9 @@ done
 for i in /lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net/usbvnet* ; do
     cuted_i=$(basename $i|cut -d. -f1)
     if  [ -f $i ]; then
-	if ( grep $cuted_i /etc/modules.conf >/dev/null ); then
+	if ( grep $cuted_i /etc/modprobe.conf >/dev/null ); then
 	    echo "NOP" >/dev/null; else
-	    echo "#post-install $cuted_i /bin/fastvnet.sh">> /etc/modules.conf;
+	    echo "#post-install $cuted_i /usr/sbin/fastvnet.sh">> /etc/modprobe.conf;
 	fi
     fi
 done
@@ -209,7 +216,7 @@ done
 %defattr(644,root,root,755)
 %doc CHANGES README
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pcmcia/atmel.conf
-#%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
 %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*
@@ -219,7 +226,7 @@ done
 %defattr(644,root,root,755)
 %doc CHANGES README
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/pcmcia/atmel.conf
-#%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
 %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*
@@ -229,6 +236,8 @@ done
 %if %{with userspace}
 %files -n atmelwlandriver-tools
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/atmelup
 %attr(755,root,root) %{_sbindir}/lvnet
+%attr(755,root,root) %{_sbindir}/winter
 %{_mandir}/man1/*
 %endif