- cut the crap from %post (use /etc/modprobe.d to provide modprobe config)

[packages/atmelwlandriver.git] / atmelwlandriver.spec

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index 46cb77c82a01787013decff374d142c4308b5899..737f1510668f6fffcb43f29cf512cd378fa933f0 100644 (file)
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -11,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.9
 Release:       %{_rel}@%{_kernel_ver_str}
 License:       GPL v2
 Group:         Base/Kernel
@@ -29,13 +29,13 @@ 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
+#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
@@ -44,12 +44,7 @@ BuildRequires:       rpmbuild(macros) >= 1.217
 BuildRequires: libusb-devel
 BuildRequires: ncurses-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
+BuildRequires: wxGTK2-%{?with_unicode:unicode-}devel >= 2.6.0
 %endif
 Requires:      wireless-tools
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -165,9 +160,9 @@ kart ATMELa.
 %patch5 -p1
 %patch6 -p1
 
-%build
 ln -sf Makefile.kernelv2.6 Makefile
 
+%build
 %if %{with kernel}
 # kernel module(s)
 rm -rf built
@@ -257,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