SPECS: ipw2200.spec, kernel-net-ieee80211.spec - sort R: - move th...

[jpc]

Author: jpc                          Date: Mon Aug 29 23:34:31 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- sort R:
- move the ieee80211 includes to %%{_kernelsrcdir}

---- Files affected:
SPECS:
   ipw2200.spec (1.25 -> 1.26) , kernel-net-ieee80211.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SPECS/ipw2200.spec
diff -u SPECS/ipw2200.spec:1.25 SPECS/ipw2200.spec:1.26
--- SPECS/ipw2200.spec:1.25	Sun Jul 31 08:47:34 2005
+++ SPECS/ipw2200.spec	Tue Aug 30 01:34:26 2005
@@ -12,7 +12,7 @@
 Summary(pl):	Sterownik dla Linuksa do kart Intel(R) PRO/Wireless 2200
 Name:		ipw2200
 Version:	1.0.6
-%define		_rel	1
+%define		_rel	2
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
@@ -40,10 +40,10 @@
 Summary(pl):	Moduł jądra Linuksa dla kart Intel(R) PRO/Wireless 2200
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Requires:	ipw2200-firmware = 2.3
 Requires:	hotplug
-%{?with_dist_kernel:%requires_releq_kernel_up}
+Requires:	ipw2200-firmware = 2.3
 Requires:	kernel-net-ieee80211
+%{?with_dist_kernel:%requires_releq_kernel_up}
 Requires(post,postun):	/sbin/depmod
 
 %description -n kernel-net-ipw2200
@@ -59,10 +59,10 @@
 Summary(pl):	Moduł jądra Linuksa SMP dla kart Intel(R) PRO/Wireless 2200
 Release:	%{_rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
-Requires:	ipw2200-firmware = 2.3
 Requires:	hotplug
-%{?with_dist_kernel:%requires_releq_kernel_smp}
+Requires:	ipw2200-firmware = 2.3
 Requires:	kernel-smp-net-ieee80211
+%{?with_dist_kernel:%requires_releq_kernel_smp}
 Requires(post,postun):	/sbin/depmod
 
 %description -n kernel-smp-net-ipw2200
@@ -94,7 +94,7 @@
                 ln -sf %{_kernelsrcdir}/scripts
         %endif
 	touch include/config/MARKER
-	export IEEE80211_INC=/lib/modules/%{_kernel_ver}/include
+	export IEEE80211_INC=%{_kernelsrcdir}/include
 	%{__make} -C %{_kernelsrcdir} clean \
 		RCS_FIND_IGNORE="-name '*.ko' -o" \
 		M=$PWD O=$PWD \
@@ -150,6 +150,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2005/08/29 23:34:26  jpc
+- sort R:
+- move the ieee80211 includes to %%{_kernelsrcdir}
+
 Revision 1.25  2005/07/31 06:47:34  adamg
 - Requires: kernel-net-ieee80211
 

================================================================
Index: SPECS/kernel-net-ieee80211.spec
diff -u SPECS/kernel-net-ieee80211.spec:1.2 SPECS/kernel-net-ieee80211.spec:1.3
--- SPECS/kernel-net-ieee80211.spec:1.2	Thu Jul 21 20:51:33 2005
+++ SPECS/kernel-net-ieee80211.spec	Tue Aug 30 01:34:26 2005
@@ -1,9 +1,5 @@
 # $Revision$, $Date$
 #
-# TODO:
-# - where to put header files? (now in /lib/modules/.../include)
-#   remember to correct ipw2200.spec when changing this
-#
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	smp		# don't build SMP module
@@ -14,7 +10,7 @@
 Summary(pl):	Moduł jądra Linuksa do stosu sieciowego ieee80211
 Name:		kernel-net-%{modname}
 Version:	1.0.3
-%define		_rel	0.1
+%define		_rel	1
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	GPL v2
 Group:		Base/Kernel
@@ -104,9 +100,9 @@
 %endif
 
 cd ..
-install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/include/net
+install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/include/net
 install net/* \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/include/net
+	$RPM_BUILD_ROOT%{_kernelsrcdir}/include/net
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -135,7 +131,7 @@
 
 %files -n %{modname}-devel
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/include/net
+%{_kernelsrcdir}/include/net/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -143,6 +139,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2005/08/29 23:34:26  jpc
+- sort R:
+- move the ieee80211 includes to %%{_kernelsrcdir}
+
 Revision 1.2  2005/07/21 18:51:33  qboosh
 - pl, typos
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ipw2200.spec?r1=1.25&r2=1.26&f=u
    http://cvs.pld-linux.org/SPECS/kernel-net-ieee80211.spec?r1=1.2&r2=1.3&f=u