- spec adapterized.

Changed files:
    analog.spec -> 1.15

diff --git a/analog.spec b/analog.spec
index 7b9768f34c5c676f428519ceeb5a7a8c3614609c..bd93003c1b42d7f85e6f39a497ab29a99b8c9f20 100644 (file)
--- a/analog.spec
+++ b/analog.spec
@@ -6,7 +6,7 @@ Release:        2
 Copyright:     distributable
 Group:         Utilities
 Group(pl):     Narzêdzia
-Source:                ftp://ftp.nhl.nl/pub/unix/analog/%{name}%{version}.tar.gz
+Source0:       ftp://ftp.nhl.nl/pub/unix/analog/%{name}%{version}.tar.gz
 Patch0:                analog-config.patch
 Requires:      webserver
 URL:           http://www.statslab.cam.ac.uk/~sret1/analog/
@@ -26,15 +26,15 @@ Group:              Utilities
 Group(pl):     Narzêdzia
 
 %description form
-Form interface to the analog httpd log analysis program.  You should
+Form interface to the analog httpd log analysis program. You should
 regenerate the form file to customize it for your server by running
 'analog -form +O/home/httpd/html/anlgform.html' after you have
 modified /etc/analog.cfg.
 
 %description -l pl form
 Interfejs w postaci formularza do programu analog. Powiniene¶
-wygenerowaæ nowy plik formularza po ustawieniu odpowiednich
-opcji w /etc/analog.cfg poprzez wykonanie komendy:
+wygenerowaæ nowy plik formularza po ustawieniu odpowiednich opcji w
+/etc/analog.cfg poprzez wykonanie komendy:
 
 %prep
 %setup -q -n %{name}%{version}
@@ -45,23 +45,22 @@ make CEXTRAFLAGS="$RPM_OPT_FLAGS" %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/home/httpd/{icons,cgi-bin,html/usage} \
+       $RPM_BUILD_ROOT{%{_var}/lib/%{name},%{_datadir}/%{name}/lang} \
+       $RPM_BUILD_ROOT{%{_bindir},%{_sysconfdir}}
 
-install -d     $RPM_BUILD_ROOT/home/httpd/{icons,cgi-bin,html/usage}
-install -d     $RPM_BUILD_ROOT%{_var}/lib/%{name}
-install -d     $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
-install -d     $RPM_BUILD_ROOT%{_bindir}
-install -d      $RPM_BUILD_ROOT/etc
+install -s analog $RPM_BUILD_ROOT%{_bindir}
+install analog.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.cfg
+install lang/* $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
+install analog.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+install images/* $RPM_BUILD_ROOT/home/httpd/icons
+install anlgform.html $RPM_BUILD_ROOT/home/httpd/html/usage
+install anlgform.pl $RPM_BUILD_ROOT/home/httpd/cgi-bin
 
-install -s     analog          $RPM_BUILD_ROOT%{_bindir}
-install                analog.cfg      $RPM_BUILD_ROOT/etc/%{name}.cfg
-install                lang/*          $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
-install                analog.cfg      $RPM_BUILD_ROOT/etc
-install                images/*        $RPM_BUILD_ROOT/home/httpd/icons
-install                anlgform.html   $RPM_BUILD_ROOT/home/httpd/html/usage
-install                anlgform.pl     $RPM_BUILD_ROOT/home/httpd/cgi-bin
-touch                          $RPM_BUILD_ROOT/home/httpd/html/usage/analog.html
+touch $RPM_BUILD_ROOT/home/httpd/html/usage/analog.html
 
 gzip -9nf docs/*.txt lang/*.html
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -71,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %dir %{_datadir}/analog/lang
 %attr(755,root,root) %dir %{_datadir}/analog
 %attr(775,root,http) %dir /var/lib/analog
-%config(noreplace) %verify(not size mtime md5) /etc/analog.cfg
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/analog.cfg
 %attr(755,root,root) %{_bindir}/analog
 %{_datadir}/analog/lang/*.*
 /home/httpd/icons/*.gif