]> git.pld-linux.org Git - packages/atmelwlandriver.git/blobdiff - atmelwlandriver.spec
- all userspace fixed
[packages/atmelwlandriver.git] / atmelwlandriver.spec
index e1deb7d97a7fe247298f3efafd10b6bd809433c9..46cb77c82a01787013decff374d142c4308b5899 100644 (file)
@@ -3,46 +3,55 @@
 %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 Linuksa do kart WLAN opartych na uk³adach AT76C5XXx
 Name:          atmelwlandriver
-Version:       3.4.0.1
-%define                _rel    3
+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/atmelwlandriver/%{name}-%{version}.tar.bz2
-# Source0-md5: 047152ce2619b6de049c01afd0417eef
+# 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
-Patch5:                %{name}-winter-makefile.patch
-Patch6:                %{name}-fucd-makefile.patch
+#Patch4:               %{name}-usb_defctrl.patch
 URL:           http://atmelwlandriver.sourceforge.net/
-BuildRequires: rpmbuild(macros) >= 1.153
-BuildRequires: %{kgcc_package}
-%if %{with kernel} && %{with dist_kernel}
-BuildRequires: kernel-module-build >= 2.6.7
-BuildRequires: kernel-source
+%if %{with kernel}
+%if %{with dist_kernel}
+BuildRequires: kernel-module-build >= 2.6.11
+BuildRequires: kernel-source >= 2.6.11
+%endif
+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
-%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires:      wireless-tools
-Requires(post,postun): /sbin/depmod
-Provides:      kernel-net(atmelwlandriver) = %{version}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,9 +67,11 @@ Summary:     Linux driver for WLAN card based on 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_up}
-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-net-atmelwlandriver
@@ -76,9 +87,11 @@ 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
+%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
@@ -143,11 +156,11 @@ Narz
 kart ATMELa.
 
 %prep
-%setup -q -n atmelwlandriver
+%setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
-#patch2 -p1
-#patch3 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -160,44 +173,51 @@ ln -sf Makefile.kernelv2.6 Makefile
 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
-    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
+       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
+
+       %{__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
 
 %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}"
+       CCC="%{__cc}" \
+       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
@@ -221,11 +241,11 @@ 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
 
 %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}
@@ -237,30 +257,32 @@ 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
+#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
+#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
@@ -270,8 +292,8 @@ done
 %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
+%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*
@@ -280,8 +302,8 @@ done
 %files -n kernel-smp-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
+%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*
This page took 0.061314 seconds and 4 git commands to generate.