SPECS: ipw2200.spec - release 3 - avoid module names conflicts; ST...

blues blues at pld-linux.org
Mon Jan 16 00:45:51 CET 2006


Author: blues                        Date: Sun Jan 15 23:45:51 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- release 3 - avoid module names conflicts; STBR because someone(TM) has 
  cut off my builder access...

---- Files affected:
SPECS:
   ipw2200.spec (1.32 -> 1.33) 

---- Diffs:

================================================================
Index: SPECS/ipw2200.spec
diff -u SPECS/ipw2200.spec:1.32 SPECS/ipw2200.spec:1.33
--- SPECS/ipw2200.spec:1.32	Mon Jan 16 00:29:04 2006
+++ SPECS/ipw2200.spec	Mon Jan 16 00:45:45 2006
@@ -9,7 +9,7 @@
 Summary(pl):	Sterownik dla Linuksa do kart Intel(R) PRO/Wireless 2200
 Name:		ipw2200
 Version:	1.0.10
-%define		_rel	2
+%define		_rel	3
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
@@ -110,11 +110,11 @@
 
 cd built
 install -d $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}{,smp}/misc
-install %{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/*.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc
+install %{?with_dist_kernel:up}%{!?with_dist_kernel:nondist}/ipw2200.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/misc/ipw2200_current.ko
 %if %{with smp} && %{with dist_kernel}
-install smp/*.ko \
-	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc
+install smp/ipw2200.ko \
+	$RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}smp/misc/ipw2200_current.ko
 %endif
 
 %clean
@@ -134,12 +134,12 @@
 
 %files -n kernel-net-ipw2200
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}/misc/ipw2200.ko*
+/lib/modules/%{_kernel_ver}/misc/ipw2200*.ko*
 
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel-smp-net-ipw2200
 %defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/ipw2200.ko*
+/lib/modules/%{_kernel_ver}smp/misc/ipw2200*.ko*
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -148,6 +148,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2006/01/15 23:45:45  blues
+- release 3 - avoid module names conflicts; STBR because someone(TM) has
+  cut off my builder access...
+
 Revision 1.32  2006/01/15 23:29:04  blues
 - move module to misc directory - don't overwrite kernel's one
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ipw2200.spec?r1=1.32&r2=1.33&f=u



More information about the pld-cvs-commit mailing list