X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=atmelwlandriver.spec;h=737f1510668f6fffcb43f29cf512cd378fa933f0;hb=a116edbfd2d93936ab594302164e11bde709cc0a;hp=a19278e06e19218db3f5a88262e36f1429fb5331;hpb=a38a8e66080273f2721d235621fdc9d72e18c8e0;p=packages%2Fatmelwlandriver.git

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index a19278e..737f151 100644
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -3,6 +3,7 @@
 %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)
 
@@ -10,11 +11,11 @@
 %undefine	with_dist_kernel
 %endif
 
+%define		_rel	0.9
 Summary:	Linux driver for WLAN card based on AT76C5XXx
 Summary(pl):	Sterownik dla Linuksa do kart WLAN opartych na uk³adach AT76C5XXx
 Name:		atmelwlandriver
 Version:	3.4.1.1
-%define		_rel	0.1
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
@@ -26,13 +27,15 @@ Patch1:		%{name}-etc.patch
 Patch2:		%{name}-usb-api.patch
 Patch3:		%{name}-gcc4.patch
 Patch4:		%{name}-winter-makefile.patch
-#Patch2:		%{name}-fpmath.patch
-#Patch3:		%{name}-delay.patch
-#Patch4:		%{name}-usb_defctrl.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-module-build >= 2.6.11
+BuildRequires:	kernel-module-build >= 3:2.6.11
 BuildRequires:	kernel-source >= 2.6.11
 %endif
 BuildRequires:	rpmbuild(macros) >= 1.217
@@ -41,8 +44,7 @@ BuildRequires:	rpmbuild(macros) >= 1.217
 BuildRequires:	libusb-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	ncurses-ext-devel
-BuildRequires:	wxGTK2-devel >= 2.4.0
-BuildRequires:	wxWindows-devel >= 2.4.0
+BuildRequires:	wxGTK2-%{?with_unicode:unicode-}devel >= 2.6.0
 %endif
 Requires:	wireless-tools
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -155,10 +157,12 @@ kart ATMELa.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
-%build
 ln -sf Makefile.kernelv2.6 Makefile
 
+%build
 %if %{with kernel}
 # kernel module(s)
 rm -rf built
@@ -194,17 +198,21 @@ done
 
 %if %{with userspace}
 %{__make} winter \
-	OPT="%{rpmcflags}"
+	OPT="%{rpmcflags}" \
+	WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
 
 %{__make} lvnet \
-	OPT="%{rpmcflags} %{rpmldflags}"
+	OPT="%{rpmcflags} %{rpmldflags}" \
+	INCDIR=%{_includedir}
 
 %{__make} -C src/apps/fw-upgrade atmelup \
 	CCC="%{__cc}" \
-	CCFLAGS="%{rpmcflags}"
+	CCFLAGS="%{rpmcflags}" \
+	WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
 
 %{__make} -C src/apps/fw-upgrade fucd \
-	OPT="%{rpmcflags}"
+	OPT="%{rpmcflags}" \
+	WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
 %endif
 
 %install
@@ -244,32 +252,12 @@ install src/apps/fw-upgrade/fucd $RPM_BUILD_ROOT%{_sbindir}
 rm -rf $RPM_BUILD_ROOT
 
 %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 -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/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