SPECS: linux-wlan-ng.spec - build fixes (requested and sponsored b...

[pluto]

Author: pluto                        Date: Mon Jul 18 20:00:01 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build fixes (requested and sponsored by Averne).
- cosmetics.

---- Files affected:
SPECS:
   linux-wlan-ng.spec (1.29 -> 1.30) 

---- Diffs:

================================================================
Index: SPECS/linux-wlan-ng.spec
diff -u SPECS/linux-wlan-ng.spec:1.29 SPECS/linux-wlan-ng.spec:1.30
--- SPECS/linux-wlan-ng.spec:1.29	Wed Mar 23 18:18:07 2005
+++ SPECS/linux-wlan-ng.spec	Mon Jul 18 21:59:56 2005
@@ -23,11 +23,13 @@
 Source0:	ftp://ftp.linux-wlan.org/pub/linux-wlan-ng/%{name}-%{version}-%{_pre}.tar.bz2
 # Source0-md5:	fff64e543e094b2007d614697f505344
 Patch0:		%{name}-Makefile.patch
-Patch1:		%{name}-pcmcia.patch
+Patch1:		%{name}-configure.patch
 Patch2:		%{name}-init.patch
 Patch3:		%{name}-wland.patch
+%if %{with kernel}
 %{?with_dist_kernel:BuildRequires:	kernel-module-build >= 2.6.7}
-BuildRequires:	rpmbuild(macros) >= 1.153
+BuildRequires:	rpmbuild(macros) >= 1.217
+%endif
 Requires(post,preun):	/sbin/chkconfig
 URL:		http://www.linux-wlan.com/
 ExcludeArch:	sparc sparc64
@@ -63,8 +65,11 @@
 Summary(pl):	Sterowniki mikrofalowych kart sieciowych
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Applications/System
-%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
 
 %description -n kernel-net-wlan-ng
 Drivers for microwave wirelless network cards.
@@ -78,10 +83,11 @@
 Summary(pl):	Sterowniki mikrofalowych kart sieciowych
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Applications/System
-%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-net-wlan-ng
-Obsoletes:	kernel-net-wlan-ng
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif
 
 %description -n kernel-smp-net-wlan-ng
 Drivers for microwave wirelless network cards.
@@ -95,8 +101,11 @@
 Summary(pl):	Sterowniki mikrofalowych kart sieciowych PCMCIA
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Applications/System
-%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
+%if %{with dist_kernel}
+%requires_releq_kernel_up
+Requires(postun):	%releq_kernel_up
+%endif
 
 %description -n kernel-net-wlan-ng-pcmcia
 Drivers for microwave wirelless PCMCIA network cards.
@@ -110,10 +119,11 @@
 Summary(pl):	Sterowniki mikrofalowych kart sieciowych PCMCIA
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Applications/System
-%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
-Provides:	kernel-net-wlan-ng-pcmcia
-Obsoletes:	kernel-net-wlan-ng-pcmcia
+%if %{with dist_kernel}
+%requires_releq_kernel_smp
+Requires(postun):	%releq_kernel_smp
+%endif%{?with_dist_kernel:%requires_releq_kernel_smp}
 
 %description -n kernel-smp-net-wlan-ng-pcmcia
 Drivers for microwave wirelless PCMCIA network cards.
@@ -124,8 +134,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}-%{_pre}
-#%patch0 -p1
-%patch1 -p1
+%patch0 -p1
+%patch1 -p0
 %patch2 -p1
 %patch3 -p1
 
@@ -146,9 +156,10 @@
 mkdir -p built-{smp,up,nondist}
 w=$PWD
 for cfg in %{?with_dist_kernel:%{?with_smp:smp} up}%{!?with_dist_kernel:nondist}; do
-    if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
-	exit 1
-    fi
+	if [ ! -r "%{_kernelsrcdir}/config-$cfg" ]; then
+		exit 1
+	fi
+	
 	cd p80211
 	ln -sf ../include/wlan wlan
 	cd ../prism2
@@ -157,22 +168,23 @@
 	ln -sf ../../include/wlan wlan
 	ln -sf ../include/prism2 prism2
 	cd ../..
-    for d in p80211 prism2/driver; do
-	cd $w/$d
-	rm -rf include
-	install -d include/{config,linux}
-	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 modules \
-	    WLAN_SRC="$PWD/" \
-	    RCS_FIND_IGNORE="-name '*.ko' -o" \
-	    M=$PWD O=$PWD \
-	    %{?with_verbose:V=1}
-	mv *.ko $w/built-$cfg
-	cd ../..
-    done
+
+	for d in p80211 prism2/driver; do
+		cd $w/$d
+		rm -rf include
+		install -d include/{config,linux}
+		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 modules \
+		    WLAN_SRC="$PWD/" \
+		    RCS_FIND_IGNORE="-name '*.ko' -o" \
+		    M=$PWD O=$PWD \
+		    %{?with_verbose:V=1}
+		mv *.ko $w/built-$cfg
+		cd ../..
+	done
 done
 cd $w
 %endif
@@ -191,7 +203,6 @@
 install built-smp/*.ko \
 	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/kernel/drivers/net/wireless
 %endif
-cd -
 %endif
 
 %clean
@@ -294,6 +305,10 @@
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 $Log$
+Revision 1.30  2005/07/18 19:59:56  pluto
+- build fixes (requested and sponsored by Averne).
+- cosmetics.
+
 Revision 1.29  2005/03/23 17:18:07  glen
 - dropped SourceX-size
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linux-wlan-ng.spec?r1=1.29&r2=1.30&f=u