- don't use %{without ...}, it may not work after inverting bcond

[packages/atmelwlandriver.git] / atmelwlandriver.spec

diff --git a/atmelwlandriver.spec b/atmelwlandriver.spec
index daf1d4bbe8eabd288081c6f637fbd654fe8ad325..6235b207723f2205ebb9800ebc0da04d2127f40e 100644 (file)
--- a/atmelwlandriver.spec
+++ b/atmelwlandriver.spec
@@ -7,15 +7,15 @@
 %bcond_without userspace       # don't build userspace applications
 %bcond_with    verbose         # verbose build (V=1)
 
-%if %{without kernel}
+%if !%{with kernel}
 %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
@@ -45,7 +45,6 @@ BuildRequires:        libusb-devel
 BuildRequires: ncurses-devel
 BuildRequires: ncurses-ext-devel
 BuildRequires: wxGTK2-%{?with_unicode:unicode-}devel >= 2.6.0
-BuildRequires: wxWidgets-%{?with_unicode:unicode-}devel >= 2.6.0
 %endif
 Requires:      wireless-tools
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -161,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
@@ -173,24 +172,30 @@ for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}
                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
+       install -d o/include/{linux,config}
+       ln -sf %{_kernelsrcdir}/config-$cfg o/.config
+       ln -sf %{_kernelsrcdir}/include/linux/autoconf-$cfg.h o/include/linux/autoconf.h
+       ln -sf %{_kernelsrcdir}/Module.symvers-$cfg o/Module.symvers
+
+%if %{with dist_kernel}
+       %{__make} -j1 -C %{_kernelsrcdir} O=$PWD/o prepare scripts
+%else
+       install -d o/include/config
+       touch o/include/config/MARKER
+       ln -sf %{_kernelsrcdir}/scripts o/scripts
+%endif
 
        %{__make} -C %{_kernelsrcdir} clean \
                RCS_FIND_IGNORE="-name '*.ko' -o" \
-               M=$PWD O=$PWD \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        %{__make} pcmcia buildonly=release \
                KERNEL_VERSION=%{__kernel_ver} \
-               M=$PWD O=$PWD \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
        %{__make} usb buildonly=release \
                KERNEL_VERSION=%{__kernel_ver} \
-               M=$PWD O=$PWD \
+               M=$PWD O=$PWD/o \
                %{?with_verbose:V=1}
 
        mv -f objs/*/release/*.ko built/$cfg
@@ -200,20 +205,20 @@ done
 %if %{with userspace}
 %{__make} winter \
        OPT="%{rpmcflags}" \
-       WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
+       WXCONFIG="wx-gtk2-%{?with_unicode:unicode}%{!?with_unicode:ansi}-config"
 
 %{__make} lvnet \
        OPT="%{rpmcflags} %{rpmldflags}" \
-       INCDIR=%{_includedir}
+       INCDIR=%{_includedir} \
 
 %{__make} -C src/apps/fw-upgrade atmelup \
        CCC="%{__cc}" \
        CCFLAGS="%{rpmcflags}" \
-       WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
+       WXCONFIG="wx-gtk2-%{?with_unicode:unicode}%{!?with_unicode:ansi}-config"
 
 %{__make} -C src/apps/fw-upgrade fucd \
        OPT="%{rpmcflags}" \
-       WXCONFIG="wx-gtk2-%{?with_uncide:unicode}%{!?with_unicode:ansi}-config"
+       WXCONFIG="wx-gtk2-%{?with_unicode:unicode}%{!?with_unicode:ansi}-config"
 %endif
 
 %install
@@ -253,32 +258,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