SPECS: madwifi-ng.spec - added provides/obsoletes madwifi{, -devel}...

[tommat]

Author: tommat                       Date: Tue Jan 10 16:26:01 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added provides/obsoletes madwifi{,-devel}
- simplified install section
- simplified files section
- build with manuals
- rel 3

---- Files affected:
SPECS:
   madwifi-ng.spec (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SPECS/madwifi-ng.spec
diff -u SPECS/madwifi-ng.spec:1.4 SPECS/madwifi-ng.spec:1.5
--- SPECS/madwifi-ng.spec:1.4	Fri Dec 30 23:46:59 2005
+++ SPECS/madwifi-ng.spec	Tue Jan 10 17:25:54 2006
@@ -18,12 +18,14 @@
 %define		snap_day	30
 %define		snap	%{snap_year}%{snap_month}%{snap_day}
 %define		snapdate	%{snap_year}-%{snap_month}-%{snap_day}
-%define		_rel	0.%{snap}.2
+%define		_rel	0.%{snap}.3
 %define		trunk	r1370
 Release:	%{_rel}
 Epoch:		0
 License:	GPL/BSD (partial source)
 Group:		Base/Kernel
+Obsoletes:	madwifi
+Provides:	madwifi
 Source0:	http://snapshots.madwifi.org/madwifi-ng/%{name}-%{trunk}-%{snap}.tar.gz
 # Source0-md5:	3fe749bf48a7f1edffffd7be8e394b47
 URL:		http://www.madwifi.org/
@@ -46,6 +48,8 @@
 Summary:	Header files for madwifi
 Summary(pl):	Pliki nagłówkowe dla madwifi
 Group:		Development/Libraries
+Obsoletes:	madwifi-devel
+Provides:	madwifi-devel
 
 %description devel
 Header files for madwifi.
@@ -155,21 +159,12 @@
 
 %if %{with userspace}
 install -d $RPM_BUILD_ROOT%{_bindir}
-install tools/80211debug $RPM_BUILD_ROOT%{_bindir}/80211debug
-install tools/80211stats $RPM_BUILD_ROOT%{_bindir}/80211stats
-install tools/athchans $RPM_BUILD_ROOT%{_bindir}/athchans
-install tools/athctrl $RPM_BUILD_ROOT%{_bindir}/athctrl
-install tools/athdebug $RPM_BUILD_ROOT%{_bindir}/athdebug
-install tools/athkey $RPM_BUILD_ROOT%{_bindir}/athkey
-install tools/athstats $RPM_BUILD_ROOT%{_bindir}/athstats
-install tools/wlanconfig $RPM_BUILD_ROOT%{_bindir}/wlanconfig
-#install tools/wlanstats $RPM_BUILD_ROOT%{_bindir}/wlanstats
-#install tools/wlandebug $RPM_BUILD_ROOT%{_bindir}/wlandebug
 
-echo r | %{__make} -C tools install \
+%{__make} install-tools \
 	KERNELCONF="%{_kernelsrcdir}/config-up" \
 	DESTDIR=$RPM_BUILD_ROOT \
-	BINDIR=%{_bindir}
+	BINDIR=%{_bindir} \
+	MANDIR=%{_mandir}
 
 install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/net80211
 install -d $RPM_BUILD_ROOT%{_includedir}/madwifi/include/sys
@@ -226,10 +221,9 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT README
-%attr(755,root,root) %{_bindir}/80211*
-%attr(755,root,root) %{_bindir}/ath*
-%attr(755,root,root) %{_bindir}/wlan*
+%doc COPYRIGHT README docs/WEP-HOWTO.txt docs/users*
+%attr(755,root,root) %{_bindir}/*
+%{_mandir}/man8/*
 
 %files devel
 %defattr(644,root,root,755)
@@ -254,6 +248,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2006/01/10 16:25:54  tommat
+- added provides/obsoletes madwifi{,-devel}
+- simplified install section
+- simplified files section
+- build with manuals
+- rel 3
+
 Revision 1.4  2005/12/30 22:46:59  zboczuch
 - added missing wlan_scan_ modules - thanks to Marcin Skubała
   ( m_marcin [at] tlen [dot] pl )
================================================================

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