- fix file listed twice

[packages/analog.git] / analog.spec

diff --git a/analog.spec b/analog.spec
index 217417d4750538882312a7c0165cba0379e4e864..87cf4761ec780c0fd45d5ca45a6d7c3f3d1849b2 100644 (file)
--- a/analog.spec
+++ b/analog.spec
@@ -1,85 +1,100 @@
+# TODO:
+# - /home/services/httpd ? Is it right place?
+# - support for webapps

 Summary:       WWW server logfile analysis program
 Summary:       WWW server logfile analysis program

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

 Name:          analog
 Name:          analog

-Version:       3.32
-Release:       1
-Copyright:     distributable
-Group:         Utilities
-Group(pl):     Narzêdzia
-Source:                ftp://ftp.nhl.nl/pub/unix/%{name}/%{name}%{version}.tar.gz
-Patch:         analog-config.patch
+Version:       6.0
+Release:       7
+License:       GPL v2
+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/
-BuildRoot:     /tmp/%{name}-%{version}-buildroot
+URL:           http://www.analog.cx/
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%define         _appdir         %{_datadir}/%{name}
+%define         _webapps        /etc/webapps
+%define         _webapp         %{name}
+%define         _sysconfdir     %{_webapps}/%{_webapp}

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

-%description -l pl
-Analizator logów serwera www z wieloma opcjami.
+%description -l pl.UTF-8
+Analizator logów serwera WWW z wieloma opcjami.

 
 %package form
 Summary:       Form interface to analog
 
 %package form
 Summary:       Form interface to analog

-Summary(pl):   Interfejs w postaci formularza do analoga
-Requires:      %{name} = %{version}
-Group:         Utilities
-Group(pl):     Narzêdzia
+Summary(pl.UTF-8):     Interfejs w postaci formularza do analoga
+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%{_appdir}/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:
-`analog -form +O/home/httpd/html/usage/anlgform.html`.
+%description form -l pl.UTF-8
+Interfejs w postaci formularza do programu analog. Powinieneś
+wygenerować nowy plik formularza po ustawieniu odpowiednich opcji w
+/etc/analog.cfg poprzez wykonanie polecenia:
+'analog -form +O%{_appdir}/html/anlgform.html'

 
 %prep
 
 %prep

-%setup -q -n %{name}%{version}
-%patch -p1
+%setup  -q
+%patch0 -p1

 
 %build
 
 %build

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

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

+install -d $RPM_BUILD_ROOT%{_appdir}/{icons,cgi-bin,html/usage,lang} \
+       $RPM_BUILD_ROOT{%{_var}/lib/%{name},%{_bindir},%{_sysconfdir}} \
+       $RPM_BUILD_ROOT%{_mandir}/man1

 
 

-install -d     $RPM_BUILD_ROOT/home/httpd/{icons,cgi-bin,html/usage}
-install -d     $RPM_BUILD_ROOT%{_var}/state/%{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/etc/%{name}.cfg
+install lang/* $RPM_BUILD_ROOT%{_appdir}/lang
+install analog.cfg $RPM_BUILD_ROOT%{_sysconfdir}
+install images/* $RPM_BUILD_ROOT%{_appdir}/icons
+install anlgform.html $RPM_BUILD_ROOT%{_appdir}/html/usage
+install anlgform.pl $RPM_BUILD_ROOT%{_appdir}/cgi-bin
+install analog.man $RPM_BUILD_ROOT%{_mandir}/man1/analog.1

 
 

-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.cgi    $RPM_BUILD_ROOT/home/httpd/cgi-bin
-touch                          $RPM_BUILD_ROOT/home/httpd/html/usage/analog.html
+touch $RPM_BUILD_ROOT%{_appdir}/html/usage/analog.html

 
 

-gzip -9nf docs/* 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
-%attr(755,root,root) %dir %{_datadir}/analog/lang
-%attr(755,root,root) %dir %{_datadir}/analog
-%attr(775,root,http) %dir /var/state/analog
-%attr(644,root,root) %config(noreplace) %verify(not size mtime md5) /etc/analog.cfg
-%attr(775,root,root) %{_bindir}/analog
-%attr(644,root,root) %{_datadir}/analog/lang/*.*
-%attr(644,root,root) /home/httpd/icons/*.gif
-%attr(755,root,root) %dir /home/httpd/html/usage
-%attr(644,root,root) %verify(not size mtime md5) /home/httpd/html/usage/analog.html
+%doc docs/* lang/* examples how-to
+%attr(755,root,root) %dir %{_appdir}
+%attr(775,root,http) %dir %{_var}/lib/%{name}
+%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) /etc/%{name}.cfg
+%attr(755,root,root) %{_bindir}/analog
+%dir %{_appdir}/lang
+%{_appdir}/lang/*.*
+%dir %{_appdir}/icons
+%{_appdir}/icons/*.gif
+%{_appdir}/icons/*.png
+%dir %{_appdir}/html
+%attr(755,root,root) %dir %{_appdir}/html/usage
+%verify(not md5 mtime size) %{_appdir}/html/usage/analog.html
+%{_mandir}/man1/*.1*

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

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