- FHS 2.0

- macros
- cleanup

Changed files:
    boa.spec -> 1.7

diff --git a/boa.spec b/boa.spec
index ea64f58ec4537e8115f5c02d91bf686f0eb53e5b..83c9b1c4d9ca5247b5835797815178d89ca56c1d 100644 (file)
--- a/boa.spec
+++ b/boa.spec
@@ -6,9 +6,13 @@ Release:       1
 Copyright:     GPL
 Group:         Networking/Daemons
 Source:                http://www.cz.boa.org/updates/%{name}-%{version}.tar.gz
-#Patch:                PLD-boa.diff
+Patch:         boa-PLD.patch
+Provides:       httpd                                                           
+Provides:       webserver                                                       
 BuildRoot:     /tmp/%{name}-%{version}-root
 
+%define                _sysconfdir     /etc/httpd
+
 %description
 A high speed, lightweight web server (HTTP protocol).
 Based on direct use of the select(2) system call, it internally multiplexes 
@@ -21,30 +25,42 @@ Nie korzystaj
 
 %prep
 %setup -q
-#%patch -p0
+%patch -p1
 
 %build
 cd src
 %configure
 make
+(cd ../util; make )
+(cd ../docs; make boa.html )
 
 %install
-install -d $RPM_BUILD_ROOT/home/httpd/{conf,logs,util,html}
+install -d $RPM_BUILD_ROOT/home/httpd/{htdocs,cgi-bin,html}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/conf,%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT/var/log/httpd
+
+install -s src/boa $RPM_BUILD_ROOT%{_sbindir}
+install -s util/boa_indexer $RPM_BUILD_ROOT%{_sbindir}
+
+install -s util/cpsel $RPM_BUILD_ROOT/home/httpd/cgi-bin
+install util/*.pl $RPM_BUILD_ROOT/home/httpd/cgi-bin
 
-install -s src/boa $RPM_BUILD_ROOT/home/httpd/
+install examples/*.conf $RPM_BUILD_ROOT/etc/httpd/conf/
+install docs/boa.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
-install conf/* $RPM_BUILD_ROOT/etc/httpd/conf/
-install docs/* $RPM_BUILD_ROOT/home/boa/docs/
-install util/* $RPM_BUILD_ROOT/home/boa/util/
+gzip -9nf README $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc README docs
-%attr(750, http, www) %dir /etc/httpd/conf
-%attr(750, http, www) %config /etc/httpd/conf/*
-%attr(755, http, www) /home/httpd/util
-%attr(755, http, www) /home/httpd/html
-%attr(750, http, www) /var/log/httpd/
+%doc README.gz docs/*.html docs/*.gif
+%attr(750, http,http) %dir /etc/httpd/conf
+%attr(640, http,http) %config /etc/httpd/conf/*
+%attr(755, http,http) /home/httpd/htdocs
+%attr(755, http,http) /home/httpd/cgi-bin
+%attr(755, http,http) /home/httpd/html
+%attr(750, http,http) /var/log/httpd/
+%attr(755, root,root) %{_sbindir}/*
+%{_mandir}/man1/*