SPECS: softmac.spec - cleanups; follow pld style

arekm arekm at pld-linux.org
Sun Jan 22 01:27:03 CET 2006


Author: arekm                        Date: Sun Jan 22 00:27:03 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups; follow pld style

---- Files affected:
SPECS:
   softmac.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/softmac.spec
diff -u SPECS/softmac.spec:1.5 SPECS/softmac.spec:1.6
--- SPECS/softmac.spec:1.5	Sat Jan 21 19:14:32 2006
+++ SPECS/softmac.spec	Sun Jan 22 01:26:58 2006
@@ -4,25 +4,23 @@
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
 %bcond_without	smp		# don't build SMP module
-#%%bcond_without	userspace	# don't build userspace module
+%bcond_without	userspace	# don't build userspace module
 %bcond_with	verbose		# verbose build (V=1)
 #
 %ifarch sparc
 %undefine	with_smp
 %endif
 #
+%define		_snap	20060120
+%define		_rel	0.%{_snap}.1
 Summary:	Layer intended to be a software MAC layer
-Summary(pl):	***
 Name:		softmac
-# can't find version !
-%define		_rel	0.1
-Version:	20060120
+Version:	0.1
 Release:	%{_rel}
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	http://softmac.sipsolutions.net/%{name}-snapshot.tar.bz2
 # Source0-md5:	4f9f11bd0648c1739e74b090f7516627
-Source1:	%{name}-symvers.add
 URL:		http://softmac.sipsolutions.net/
 Patch0:		%{name}-local_headers.patch
 %if %{with kernel}
@@ -40,9 +38,6 @@
 to software. It is intended to handle scanning, assocation and similar
 tasks.
 
-%description -l pl
-***
-
 %package devel
 Summary:	Kernel headers
 Release:	%{_rel}@%{_kernel_ver_str}
@@ -69,9 +64,6 @@
 to software. It is intended to handle scanning, assocation and similar
 tasks.
 
-%description -n kernel-net-softmac -l pl
-XXX
-
 %package -n kernel-smp-net-softmac
 Summary:	Broadcom BCM4400 driver for Linux SMP
 Summary(pl):	Sterownik do karty Broadcom BCM4400 dla Linuksa SMP
@@ -90,9 +82,6 @@
 to software. It is intended to handle scanning, assocation and similar
 tasks.
 
-%description -n kernel-smp-net-softmac -l pl
-XXX
-
 %prep
 %setup -q -n %{name}-snapshot
 %patch0 -p1
@@ -174,9 +163,8 @@
 %endif
 %endif
 
-install -d $RPM_BUILD_ROOT%{_usr}/src/%{name}-include
-cp -rf net $RPM_BUILD_ROOT%{_usr}/src/%{name}-include/
-install %{SOURCE1} $RPM_BUILD_ROOT%{_usr}/src/%{name}-include/symvers.add
+install -d $RPM_BUILD_ROOT%{_includedir}/linux/softmac
+cp -a net $RPM_BUILD_ROOT%{_includedir}/linux/softmac
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -194,13 +182,10 @@
 %depmod %{_kernel_ver}smp
 
 %if %{with userspace}
-%files
-%defattr(644,root,root,755)
-%endif
-
 %files devel
 %defattr(644,root,root,755)
-%{_usr}/src/%{name}-include
+%{_includedir}/linux/softmac
+%endif
 
 %if %{with kernel}
 %files -n kernel-net-softmac
@@ -224,6 +209,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2006/01/22 00:26:58  arekm
+- cleanups; follow pld style
+
 Revision 1.5  2006/01/21 18:14:32  sparky
 - mode modules to sm_ieee80211 subdir
 - add modprobe config
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/softmac.spec?r1=1.5&r2=1.6&f=u



More information about the pld-cvs-commit mailing list