- fixed paths for AC

[packages/analog.git] / analog.spec

diff --git a/analog.spec b/analog.spec
index 7b9768f34c5c676f428519ceeb5a7a8c3614609c..92ee1dce0e374114956a05468c1bd1d27e38e5d7 100644 (file)
--- a/analog.spec
+++ b/analog.spec
@@ -1,84 +1,87 @@
 Summary:       WWW server logfile analysis program
 Summary:       WWW server logfile analysis program

-Summary(pl):   Analizator logów serwera www
+Summary(pl):   Analizator logów serwera WWW

 Name:          analog
 Name:          analog

-Version:       4.03
-Release:       2
-Copyright:     distributable
-Group:         Utilities
-Group(pl):     Narzêdzia
-Source:                ftp://ftp.nhl.nl/pub/unix/analog/%{name}%{version}.tar.gz
-Patch0:                analog-config.patch
+Version:       6.0
+Release:       1
+License:       GPL
+Group:         Networking/Utilities
+#Source0Download:      http://www.analog.cx/download.html
+Source0:       http://www.analog.cx/%{name}-%{version}.tar.gz
+# Source0-md5: 743d03a16eb8c8488205ae63cdb671cd
+Patch0:                %{name}-config.patch

 Requires:      webserver
 Requires:      webserver

-URL:           http://www.statslab.cam.ac.uk/~sret1/analog/
+URL:           http://www.analog.cx/

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

+%define                httpdir /home/services/httpd
+

 %description
 WWW server logfile analysis program with lots of features.
 
 %description -l pl
 %description
 WWW server logfile analysis program with lots of features.
 
 %description -l pl

-Analizator logów serwera www z wieloma opcjami.
+Analizator logów serwera WWW z wieloma opcjami.

 
 %package form
 Summary:       Form interface to analog
 Summary(pl):   Interfejs w postaci formularza do analoga
 
 %package form
 Summary:       Form interface to analog
 Summary(pl):   Interfejs w postaci formularza do analoga

-Requires:      %{name} = %{version}
-Group:         Utilities
-Group(pl):     Narzêdzia
+Group:         Networking/Utilities
+Requires:      %{name} = %{version}-%{release}

 
 %description form
 
 %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
 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.
+'analog -form +O/home/services/httpd/html/anlgform.html' after you
+have modified /etc/analog.cfg.

 
 

-%description -l pl form
+%description form -l pl

 Interfejs w postaci formularza do programu analog. Powiniene¶
 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 polecenia: 'analog -form
++O/home/services/httpd/html/anlgform.html'

 
 %prep
 
 %prep

-%setup -q -n %{name}%{version}
+%setup  -q

 %patch0 -p1
 
 %build
 %patch0 -p1
 
 %build

-make CEXTRAFLAGS="$RPM_OPT_FLAGS" %{name}
+%{__make} %{name} \
+       CFLAGS="%{rpmcflags}" \
+       CEXTRAFLAGS="%{rpmcflags}"

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT

+install -d $RPM_BUILD_ROOT%{httpdir}/{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 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%{httpdir}/icons
+install anlgform.html $RPM_BUILD_ROOT%{httpdir}/html/usage
+install anlgform.pl $RPM_BUILD_ROOT%{httpdir}/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%{httpdir}/html/usage/analog.html

 
 

-gzip -9nf docs/*.txt lang/*.html

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)

-%doc docs/* lang/*.gz
+%doc docs/* lang/*

 %attr(755,root,root) %dir %{_datadir}/analog/lang
 %attr(755,root,root) %dir %{_datadir}/analog
 %attr(775,root,http) %dir /var/lib/analog
 %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/*.*
 %attr(755,root,root) %{_bindir}/analog
 %{_datadir}/analog/lang/*.*

-/home/httpd/icons/*.gif
-%attr(755,root,root) %dir /home/httpd/html/usage
-%verify(not size mtime md5) /home/httpd/html/usage/analog.html
+%{httpdir}/icons/*.gif
+%{httpdir}/icons/*.png
+%attr(755,root,root) %dir %{httpdir}/html/usage
+%verify(not size mtime md5) %{httpdir}/html/usage/analog.html

 
 %files form
 %defattr(644,root,root,755)
 
 %files form
 %defattr(644,root,root,755)

-%config(noreplace) %verify(not size mtime md5) /home/httpd/html/usage/anlgform.html
-%attr(755,root,root) /home/httpd/cgi-bin/anlgform.pl
+%config(noreplace) %verify(not size mtime md5) %{httpdir}/html/usage/anlgform.html
+%attr(755,root,root) %{httpdir}/cgi-bin/anlgform.pl