X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=analog.spec;h=92ee1dce0e374114956a05468c1bd1d27e38e5d7;hb=4f9c355e0459a78533fca78af6ba51c8e88c71fc;hp=b1d1fb38aaf04a4e8c065e6ffcae88d77d979d45;hpb=78e25c73e31406a6376932f2ecafde7b594c0688;p=packages%2Fanalog.git

diff --git a/analog.spec b/analog.spec
index b1d1fb3..92ee1dc 100644
--- a/analog.spec
+++ b/analog.spec
@@ -1,58 +1,56 @@
 Summary:	WWW server logfile analysis program
-Summary(pl):	Analizator logów serwera www
+Summary(pl):	Analizator logów serwera WWW
 Name:		analog
-Version:	5.03
+Version:	6.0
 Release:	1
-License:	distributable
+License:	GPL
 Group:		Networking/Utilities
-Group(de):	Netzwerkwesen/Werkzeuge
-Group(es):	Red/Utilitarios
-Group(pl):	Sieciowe/Narzêdzia
-Group(pt_BR):	Rede/Utilitários
-Source0:	ftp://ftp.nhl.nl/pub/unix/analog/%{name}-%{version}.tar.gz
+#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
-URL:		http://www.statslab.cam.ac.uk/~sret1/analog/
+URL:		http://www.analog.cx/
 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
-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
 Group:		Networking/Utilities
-Group(de):	Netzwerkwesen/Werkzeuge
-Group(es):	Red/Utilitarios
-Group(pl):	Sieciowe/Narzêdzia
-Group(pt_BR):	Rede/Utilitários
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 
 %description form
 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.
+'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¶
 wygenerowaæ nowy plik formularza po ustawieniu odpowiednich opcji w
 /etc/analog.cfg poprzez wykonanie polecenia: 'analog -form
-+O/home/httpd/html/anlgform.html'
++O/home/services/httpd/html/anlgform.html'
 
 %prep
-%setup -q
+%setup  -q
 %patch0 -p1
 
 %build
-%{__make} CFLAGS="%{rpmcflags}" CEXTRAFLAGS="%{rpmcflags}" %{name}
+%{__make} %{name} \
+	CFLAGS="%{rpmcflags}" \
+	CEXTRAFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/home/httpd/{icons,cgi-bin,html/usage} \
+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}}
 
@@ -60,31 +58,30 @@ 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/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
+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
 
-gzip -9nf docs/*.txt lang/*.html
+touch $RPM_BUILD_ROOT%{httpdir}/html/usage/analog.html
 
 %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
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/analog.cfg
 %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)
-%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