X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=atmelwlandriver.spec;h=e1deb7d97a7fe247298f3efafd10b6bd809433c9;hb=dd33aa552fa89b2da81ae6cb09bd6dd2849dcb31;hp=cee8d1eba322fa17c84047d0e47cd6849938e2cf;hpb=3a1c7b02d1f87a7184ff3e393a0401e77e929701;p=packages%2Fatmelwlandriver.git

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index cee8d1e..e1deb7d 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
@@ -5,31 +6,38 @@
 %bcond_without	userspace	# don't build userspace applications
 %bcond_with	verbose		# verbose build (V=1)
 #
+#
 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
-%define		_rel	0.1
+Summary(pl):	Sterownik dla Linuksa do kart WLAN opartych na uk³adach AT76C5XXx
+Name:		atmelwlandriver
+Version:	3.4.0.1
+%define		_rel	3
 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
-Source1:	atmelwlandriver.config
-# Patch0:		atmelwlandriver-makefile.patch
-Patch1:		atmelwlandriver-etc.patch
-URL:		http://atmelwlandriver.sourceforge.net
-BuildRequires:	rpmbuild(macros) >= 1.118
+Source0:	http://dl.sourceforge.net/atmelwlandriver/%{name}-%{version}.tar.bz2
+# Source0-md5:	047152ce2619b6de049c01afd0417eef
+Source1:	%{name}-vnetrc
+Patch0:		%{name}-makefile.patch
+Patch1:		%{name}-etc.patch
+#Patch2:		%{name}-fpmath.patch
+#Patch3:		%{name}-delay.patch
+Patch4:		%{name}-usb_defctrl.patch
+Patch5:		%{name}-winter-makefile.patch
+Patch6:		%{name}-fucd-makefile.patch
+URL:		http://atmelwlandriver.sourceforge.net/
+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:	libusb-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	wxWindows-devel >= 2.4.0
 BuildRequires:	wxGTK-devel >= 2.4.0
-BuildRequires:	xforms-devel
+#BuildRequires:	xforms-devel
 %endif
 %{?with_dist_kernel:%requires_releq_kernel_up}
 Requires:	wireless-tools
@@ -45,51 +53,107 @@ Linux.
 Sterownik dla Linuksa do kart sieci bezprzewodowych opartych o uk³ady
 ATMELA AT76C5XXx.
 
-%package -n kernel-smp-net-atmelwlandriver
+%package -n kernel-net-atmelwlandriver
 Summary:	Linux driver for WLAN card based on AT76C5XXx
-Summary(pl):	Sterownik dla Linuxa do kart WLAN na uk³adzie AT76C5XXx
+Summary(pl):	Sterownik dla Linuksa do kart WLAN na uk³adach AT76C5XXx
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires:	wireless-tools
 Requires(post,postun):	/sbin/depmod
 Provides:	kernel-net(atmelwlandriver) = %{version}
 
-%description -n kernel-smp-net-atmelwlandriver
+%description -n kernel-net-atmelwlandriver
 This is driver for WLAN card based on ATMEL AT76C5XXx devices for
 Linux.
 
-%description -n kernel-smp-net-atmelwlandriver -l pl
+%description -n kernel-net-atmelwlandriver -l pl
 Sterownik dla Linuksa do kart sieci bezprzewodowych opartych o uk³ady
 ATMELA AT76C5XXx.
 
-%package -n atmelwlandriver-tools
-Summary:	Tools for monitoring ATMEL Wireless Card
-Summary(pl):	Narzêdzia do monitorowania bezprzewodowych kart ATMEL
+%package -n kernel-smp-net-atmelwlandriver
+Summary:	Linux SMP driver for WLAN card based on AT76C5XXx
+Summary(pl):	Sterownik dla Linuksa SMP do kart WLAN na uk³adach AT76C5XXx
+Release:	%{_rel}@%{_kernel_ver_str}
+Group:		Base/Kernel
+%{?with_dist_kernel:%requires_releq_kernel_smp}
+Requires:	wireless-tools
+Requires(post,postun):	/sbin/depmod
+Provides:	kernel-net(atmelwlandriver) = %{version}
+
+%description -n kernel-smp-net-atmelwlandriver
+This is driver for WLAN card based on ATMEL AT76C5XXx devices for
+Linux SMP.
+
+%description -n kernel-smp-net-atmelwlandriver -l pl
+Sterownik dla Linuksa SMP do kart sieci bezprzewodowych opartych o
+uk³ady ATMELA AT76C5XXx.
+
+%package tools
+Summary:	Command line tools for managing ATMEL Wireless Card
+Summary(pl):	Narzêdzia linii poleceñ do obs³ugi bezprzewodowych kart ATMEL
+Release:	%{_rel}
+Group:		Networking/Utilities
+Requires:	kernel-net(atmelwlandriver) = %{version}
+
+%description tools
+Managing tools for the ATMEL Wireless Card adapters. When the PCMCIA
+module pcmf502*, the PCI module pcifvnet, or the USB module usbvnet*
+is loaded the lvnet application can monitor the device's statistics or
+change it's runtime parameters.
+
+%description tools -l pl
+Narzêdzia do obs³ugi dla adapterów kart sieci bezprzewodowych ATMEL.
+Kiedy modu³ PCMCIA pcmf502*, modu³ PCI pcifvnet, albo modu³ USB
+usbvnet* jest za³adowany to aplikacja lvnet mo¿e monitorowaæ dane
+statystyczne urz±dzenia albo zmieniæ parametry jego pracy.
+
+%package winter
+Summary:	Graphical tool for monitoring ATMEL Wireless Cards
+Summary(pl):	Graficzne narzêdzie do monitorowania bezprzewodowych kart ATMEL
+Release:	%{_rel}
+Group:		Networking/Utilities
+Requires:	kernel-net(atmelwlandriver) = %{version}
+
+%description winter
+Winter is an X application, that provides a visual enviroment to
+configure and manage ATMEL cards. It's functionality is similar to
+that of lvnet, extended by very useful features such as profiles,
+localization and support for more than one devices alternatively.
+
+%description winter -l pl
+Winter jest aplikacj± dla X, która dostarcza wizualne ¶rodowisko
+pozwalaj±ce na konfiguracjê kart ATMELa. Jego funkcjonalno¶æ jest
+podobna do tej jak± ma lvnet, dodatkowo rozszerzon± o bardzo przydatne
+funkcje takie jak: profile, lokalizacje i wsparcie dla wiêcej ni¿
+jednego urz±dzenia.
+
+%package fucd
+Summary:	Firmware upgrade tool for ATMEL Wireless Cards
+Summary(pl):	Narzêdzie aktualizacji bezprzewodowych kart ATMEL
 Release:	%{_rel}
 Group:		Networking/Utilities
 Requires:	kernel-net(atmelwlandriver) = %{version}
 
-%description -n atmelwlandriver-tools
-Monitoring tools for the ATMEL Wireless Card adapters. When the pcmcia
-module pcmf502*, the pci module pcifvnet, or the usb module usbvnet*
-is loaded the lvnet, xvnet, winter application can monitor the
-device's statistics or change it's runtime parameters.
+%description fucd
+Graphical firmware upgrade tool for ATMEL Wireless Cards.
 
-%description -n atmelwlandriver-tools -l pl
-Narzêdzia monitourj±ce dla adapterów kart sieci bezprzewodowych ATMEL.
-Kiedy modu³ pcmcia pcmf502*, modu³ pci pcifvnet, albo modu³ usb
-usbvnet* jest za³adowany to aplikacja lvnet, xvnet, winter mo¿e
-monitorowaæ dane statystyczne urz±dzenia albo zmieniæ parametry jego
-pracy.
+%description fucd -l pl
+Narzêdzie do aktualizacji wewnêtrznego oprogramowania bezprzewodowych
+kart ATMELa.
 
 %prep
 %setup -q -n atmelwlandriver
-#%%patch0 -p1
+%patch0 -p1
 %patch1 -p1
+#patch2 -p1
+#patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-cp -f Makefile{.kernelv2.6,}
+ln -sf Makefile.kernelv2.6 Makefile
 
 %if %{with kernel}
 # kernel module(s)
@@ -103,15 +167,18 @@ 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" \
 	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
@@ -119,20 +186,23 @@ 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../winter"
+%{__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}"
+
+%{__make} -C src/apps/fw-upgrade fucd \
+	OPT="%{rpmcflags}"
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sbindir}
 
 %if %{with kernel}
 cd built
@@ -148,43 +218,46 @@ install smp/usb* \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/usb/net
 %endif
 cd -
-%endif
-
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/pcmcia,%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/pcmcia
 cp scripts/atmel.conf $RPM_BUILD_ROOT%{_sysconfdir}/pcmcia
-cp scripts/fastvnet.sh $RPM_BUILD_ROOT%{_bindir}
-#mv -f scripts/.vnetrc $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
+cp scripts/fastvnet.sh $RPM_BUILD_ROOT%{_sbindir}
+%endif
 
-#%{__make} install \
-#	DESTDIR=$RPM_BUILD_ROOT%{_prefix} \
-#        MODDIR=$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver} \
-#	MAN_PATH=$RPM_BUILD_ROOT%{_mandir}/man1
+%if %{with userspace}
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+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}
+install src/apps/fw-upgrade/fucd $RPM_BUILD_ROOT%{_sbindir}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
+%post -n kernel-net-atmelwlandriver
 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
 %depmod %{_kernel_ver}
 
-%postun
+%postun -n kernel-net-atmelwlandriver
 %depmod %{_kernel_ver}
 
 %post -n kernel-smp-net-atmelwlandriver
 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
@@ -194,12 +267,12 @@ done
 %depmod %{_kernel_ver}smp
 
 %if %{with kernel}
-%files
+%files -n kernel-net-atmelwlandriver
 %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
-%attr(755,root,root) %{_bindir}/fastvnet.sh
+%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*
 
@@ -208,16 +281,26 @@ 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
-%attr(755,root,root) %{_bindir}/fastvnet.sh
+%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*
 %endif
 %endif
 
 %if %{with userspace}
-%files -n atmelwlandriver-tools
+%files tools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_sbindir}/atmelup
+%attr(755,root,root) %{_sbindir}/lvnet
 %{_mandir}/man1/*
+
+%files winter
+%defattr(644,root,root,755)
+%doc src/apps/winter/README.linux
+%attr(755,root,root) %{_sbindir}/winter
+
+%files fucd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/fucd
 %endif