X-Git-Url: http://git.pld-linux.org/?p=packages%2Fatmelwlandriver.git;a=blobdiff_plain;f=atmelwlandriver.spec;h=46cb77c82a01787013decff374d142c4308b5899;hp=de4bb6dd9b197deab6621c0d2103b94f2dfbfea4;hb=a435a0b193b679652e44039e70843325b0761105;hpb=27c65a82db11cab9c0d13c3eabb4891c0ec3b2c0

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index de4bb6d..46cb77c 100644
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -1,42 +1,57 @@
-%define rel	0.1
-%define         _kernel26       %(echo %{_kernel_ver} | grep -qv '2\.6\.' ; echo $?)
 #
 # Conditional build:
-%bcond_without	dist_kernel	# Don't use a packaged kernel
-%bcond_without	smp		# Don't build the SMP module
-#
-%bcond_without 	pci		# Don't build pci drivers
-%bcond_without 	pcmcia		# Don't build pcmcia drivers
-%bcond_without 	usb		# Don't build usb drivers
-%bcond_without	apps		# Don't build applications
-#
+%bcond_without	dist_kernel	# allow non-distribution kernel
+%bcond_without	kernel		# don't build kernel modules
+%bcond_without	smp		# don't build SMP modules
+%bcond_with	unicode		# use wx-gtk2-unicode-config instead of ansi
+%bcond_without	userspace	# don't build userspace applications
+%bcond_with	verbose		# verbose build (V=1)
+
+%if %{without kernel}
+%undefine	with_dist_kernel
+%endif
+
 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
-Release:	%{rel}@%{_kernel_ver_str}
+Summary(pl):	Sterownik dla Linuksa do kart WLAN opartych na uk³adach AT76C5XXx
+Name:		atmelwlandriver
+Version:	3.4.1.1
+%define		_rel	0.9
+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
-BuildRequires:	%{kgcc_package}
+Source0:	http://dl.sourceforge.net/atmelwlandriver/%{name}-%{version}.tar.bz2
+# Source0-md5:	6cb3671091c7ccaa646222c50ee242c9
+Source1:	%{name}-vnetrc
+Patch0:		%{name}-makefile.patch
+Patch1:		%{name}-etc.patch
+Patch2:		%{name}-usb-api.patch
+Patch3:		%{name}-gcc4.patch
+Patch4:		%{name}-winter-makefile.patch
+Patch5:		%{name}-fwupgrade.patch
+Patch6:		%{name}-cmdline.patch
+#Patch2:		%{name}-fpmath.patch
+#Patch3:		%{name}-delay.patch
+#Patch4:		%{name}-usb_defctrl.patch
+URL:		http://atmelwlandriver.sourceforge.net/
+%if %{with kernel}
 %if %{with dist_kernel}
-BuildRequires:	kernel-headers
-%requires_releq_kernel_up
+BuildRequires:	kernel-module-build >= 2.6.11
+BuildRequires:	kernel-source >= 2.6.11
 %endif
-%if %{with apps}
+BuildRequires:	rpmbuild(macros) >= 1.217
+%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:	ncurses-ext-devel
+BuildRequires:	wxGTK2-devel >= 2.6.0
+%if %{with unicode}
+BuildRequires:	wxWidgets-unicode-devel >= 2.6.0
+%else
+BuildRequires:	wxWidgets-devel >= 2.6.0
+%endif
 %endif
 Requires:	wireless-tools
-Requires(post,postun):	/sbin/depmod
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -47,146 +62,267 @@ 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
-Release:	%{rel}@%{_kernel_ver_str}
+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}
-Requires:	wireless-tools
 Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
+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 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
+Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
+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.
 
-%package -n atmelwlandriver-tools
-Summary:	Tools for monitoring ATMEL Wireless Card
-Summary(pl):	Narzêdzia do monitorowania bezprzewodowych kart ATMEL
-Release:	%{rel}
+%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:	%{name} = %{version}
+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
+%setup -q -n %{name}
+%patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
-cp %{SOURCE1} .config
-%{?with_pci:echo "CONFIG_PCI=y" >> .config}
-%{?with_pcmcia:echo "CONFIG_PCMCIA=y" >> .config}
-%{?with_usb:echo "CONFIG_USB=y" >> .config}
-echo "KERNEL_SRC=/lib/modules/%{_kernel_ver}/build" >> .config
-echo "PCMCIA_SRC=/lib/modules/%{_kernel_ver}/build" >> .config
+%build
+ln -sf Makefile.kernelv2.6 Makefile
 
-%if %{_kernel26}
-echo "NEW_KERNEL=y" >> .config
-%endif
+%if %{with kernel}
+# kernel module(s)
+rm -rf built
+mkdir -p built/{nondist,smp,up}
+for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	rm -rf include
+	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
+	ln -sf %{_kernelsrcdir}/Module.symvers-$cfg Module.symvers
+	touch include/config/MARKER
 
-%build
-KCFLAGS="-D__KERNEL__ -DMODULE %{rpmcflags} -fomit-frame-pointer -pipe"
-KCFLAGS="$KCFLAGS -Wall -I%{_kernelsrcdir}/include"
-
-# SMP build
-%if %{with smp}
-%{__make} all \
-	KCFLAGS="$KCFLAGS -D__SMP__ -D__KERNEL_SMP=1"
-mkdir objs-smp
-mv -f objs/*.o objs-smp/
+	%{__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
+done
 %endif
 
-%{?with_apps:echo "CONFIG_APPS=y" >> .config}
-%{__make} all \
-	KCFLAGS="$KCFLAGS" \
+%if %{with userspace}
+%{__make} winter \
 	OPT="%{rpmcflags}" \
+	WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
+
+%{__make} lvnet \
+	OPT="%{rpmcflags} %{rpmldflags}" \
+	INCDIR=%{_includedir}
+
+%{__make} -C src/apps/fw-upgrade atmelup \
+	CCC="%{__cc}" \
+	CCFLAGS="%{rpmcflags}" \
+	WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
+
+%{__make} -C src/apps/fw-upgrade fucd \
+	OPT="%{rpmcflags}" \
+	WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_sbindir}
 
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/{net,usb,pcmcia}
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/{net,usb,pcmcia}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}/pcmcia,%{_mandir}/man1}
-
-mv -f scripts/.vnetrc $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
+%if %{with kernel}
+cd built
+install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/kernel/drivers/{net/pcmcia,usb/net}
+install %{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/pcm* \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/net/pcmcia
+install %{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/usb* \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/drivers/usb/net
+%if %{with smp} && %{with dist_kernel}
+install smp/pcm* \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/pcmcia
+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}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/vnetrc
+%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 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
-for i in /lib/modules/%{_kernel_ver}/kernel/drivers/usb/usbvnet* ; do
-	cuted_i=$(basename $i|cut -d. -f1)
-	if  [ -f $i ]; then
-		if ( grep $cuted_i /etc/modules.conf >/dev/null ); then
-			echo "NOP" >/dev/null; else
-			echo "#post-install $cuted_i /bin/fastvnet.sh">> /etc/modules.conf;
-		fi
-	fi
-done
+%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/modprobe.conf >/dev/null ); then
+#			echo "NOP" >/dev/null;
+#		else
+#			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/usbvnet* ; do
-	cuted_i=$(basename $i|cut -d. -f1)
-	if  [ -f $i ]; then
-		if ( grep $cuted_i /etc/modules.conf >/dev/null ); then
-			echo "NOP" >/dev/null; else
-			echo "#post-install $cuted_i /bin/fastvnet.sh">> /etc/modules.conf;
-		fi
-	fi
-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/modprobe.conf >/dev/null ); then
+#			echo "NOP" >/dev/null;
+#		else
+#			echo "#post-install $cuted_i /usr/sbin/fastvnet.sh">> /etc/modprobe.conf;
+#		fi
+#	fi
+#done
 %depmod %{_kernel_ver}smp
 
 %postun -n kernel-smp-net-atmelwlandriver
 %depmod %{_kernel_ver}smp
 
-%files
+%if %{with kernel}
+%files -n kernel-net-atmelwlandriver
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fastvnet.sh
 %doc CHANGES README
-/lib/modules/%{_kernel_ver}/*
-%{_sysconfdir}/pcmcia/atmel.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcmcia/atmel.conf
+%config(noreplace) %verify(not md5 mtime size) %{_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*
 
-%if %{with smp}
+%if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-atmelwlandriver
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fastvnet.sh
 %doc CHANGES README
-/lib/modules/%{_kernel_ver}smp/*
-%{_sysconfdir}/pcmcia/atmel.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/vnetrc
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pcmcia/atmel.conf
+%config(noreplace) %verify(not md5 mtime size) %{_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 apps}
-%files -n atmelwlandriver-tools
+%if %{with userspace}
+%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