SPECS: madwifi.spec - moved -devel to userspace part

qboosh qboosh at pld-linux.org
Sat Jul 16 14:04:40 CEST 2005


Author: qboosh                       Date: Sat Jul 16 12:04:40 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- moved -devel to userspace part

---- Files affected:
SPECS:
   madwifi.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/madwifi.spec
diff -u SPECS/madwifi.spec:1.17 SPECS/madwifi.spec:1.18
--- SPECS/madwifi.spec:1.17	Thu Jul 14 22:13:42 2005
+++ SPECS/madwifi.spec	Sat Jul 16 14:04:35 2005
@@ -1,7 +1,7 @@
-# TODO: kernel header is additional BR
-#
 # $Revision$, $Date$
 #
+# TODO: kernel header is additional BR  (whatever it means???)
+#
 # Conditional build:
 %bcond_without	dist_kernel	# allow non-distribution kernel
 %bcond_without	kernel		# don't build kernel modules
@@ -40,6 +40,17 @@
 %description -l pl
 Sterownik karty radiowej Atheros.
 
+%package devel
+Summary:	Header files for madwifi
+Summary(pl):	Pliki nagłówkowe dla madwifi
+Group:		Development/Libraries
+
+%description devel
+Header files for madwifi.
+
+%description devel -l pl
+Pliki nagłówkowe dla madwifi.
+
 # kernel subpackages.
 
 %package -n kernel-net-madwifi
@@ -84,17 +95,6 @@
 
 Ten pakiet zawiera moduł jądra Linuksa SMP.
 
-%package devel
-Summary:	Header files for madwifi
-Summary(pl):	Pliki nagłówkowe dla madwifi
-Group:		Development/Libraries
-
-%description devel
-Header files for madwifi.
-
-%description devel -l pl
-Pliki nagłówkowe dla madwifi.
-
 %prep
 %setup -q -n %{name}
 
@@ -161,6 +161,12 @@
 	KERNELCONF="%{_kernelsrcdir}/config-up" \
 	DESTDIR=$RPM_BUILD_ROOT \
 	BINDIR=%{_bindir}
+
+install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/net80211
+install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/include/sys
+install net80211/*.h $RPM_BUILD_ROOT%{_includedir}/madwifi/net80211
+install include/*.h $RPM_BUILD_ROOT%{_includedir}/madwifi/include
+install include/sys/*.h $RPM_BUILD_ROOT%{_includedir}/madwifi/include/sys
 %endif
 
 %if %{with kernel}
@@ -189,12 +195,6 @@
 %endif
 %endif
 
-install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/net80211
-install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/include/sys
-install net80211/*.h $RPM_BUILD_ROOT%{_includedir}/madwifi/net80211/
-install include/*.h $RPM_BUILD_ROOT%{_includedir}/madwifi/include/
-install include/sys/*.h $RPM_BUILD_ROOT%{_includedir}/madwifi/include/sys/
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -216,6 +216,10 @@
 %doc COPYRIGHT README
 %attr(755,root,root) %{_bindir}/80211*
 %attr(755,root,root) %{_bindir}/ath*
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/madwifi
 %endif
 
 %if %{with kernel}
@@ -230,16 +234,15 @@
 %endif
 %endif
 
-%files devel
-%defattr(644,root,root,755)
-/%{_includedir}/madwifi
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2005/07/16 12:04:35  qboosh
+- moved -devel to userspace part
+
 Revision 1.17  2005/07/14 20:13:42  spider
 - md5 fix
 - added todo
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/madwifi.spec?r1=1.17&r2=1.18&f=u




More information about the pld-cvs-commit mailing list