SPECS: atmelwlandriver.spec - all userspace fixed

[prism]

Author: prism                        Date: Tue Apr 11 19:52:47 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- all userspace fixed

---- Files affected:
SPECS:
   atmelwlandriver.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/atmelwlandriver.spec
diff -u SPECS/atmelwlandriver.spec:1.36 SPECS/atmelwlandriver.spec:1.37
--- SPECS/atmelwlandriver.spec:1.36	Mon Dec 12 14:44:45 2005
+++ SPECS/atmelwlandriver.spec	Tue Apr 11 21:52:41 2006
@@ -4,6 +4,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)
 
@@ -15,7 +16,7 @@
 Summary(pl):	Sterownik dla Linuksa do kart WLAN opartych na układach AT76C5XXx
 Name:		atmelwlandriver
 Version:	3.4.1.1
-%define		_rel	0.1
+%define		_rel	0.9
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
@@ -27,6 +28,8 @@
 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
@@ -42,8 +45,12 @@
 BuildRequires:	libusb-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	ncurses-ext-devel
-BuildRequires:	wxGTK2-devel >= 2.4.0
-BuildRequires:	wxWindows-devel >= 2.4.0
+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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -156,6 +163,8 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
 ln -sf Makefile.kernelv2.6 Makefile
@@ -195,17 +204,21 @@
 
 %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
@@ -321,6 +334,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2006/04/11 19:52:41  prism
+- all userspace fixed
+
 Revision 1.36  2005/12/12 13:44:45  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/atmelwlandriver.spec?r1=1.36&r2=1.37&f=u