X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=analog.spec;h=caf0706c21b7a1ff3a47520d7910c14dd02e9a93;hb=50debe694e98df3242a2912747c3539afe16a1d9;hp=0d8d3fa33a14f49fe422df403c48f0a2b968abbe;hpb=40fc916e16d76afa10698faf9c6572718e91b51d;p=packages%2Fanalog.git

diff --git a/analog.spec b/analog.spec
index 0d8d3fa..caf0706 100644
--- a/analog.spec
+++ b/analog.spec
@@ -1,86 +1,96 @@
+# TODO:
+# - /home/services/httpd ? Is it right place?
+# - support for webapps
 Summary:	WWW server logfile analysis program
-Summary(pl):	Analizator logów serwera www
+Summary(pl.UTF-8):	Analizator logów serwera WWW
 Name:		analog
-Version:	5.32
-Release:	1
-License:	distributable
+Version:	6.0
+Release:	3
+License:	GPL v2
 Group:		Networking/Utilities
 #Source0Download:	http://www.analog.cx/download.html
 Source0:	http://www.analog.cx/%{name}-%{version}.tar.gz
-# Source0-md5:	077a2d43c8f5c2bddf37129ca63ec1f8
+# Source0-md5:	743d03a16eb8c8488205ae63cdb671cd
 Patch0:		%{name}-config.patch
-Patch1:		%{name}-png.patch
 Requires:	webserver
 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 -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
-Summary(pl):	Interfejs w postaci formularza do analoga
+Summary(pl.UTF-8):	Interfejs w postaci formularza do analoga
 Group:		Networking/Utilities
-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%{_appdir}/html/anlgform.html'
+after you have modified /etc/analog.cfg.
 
-%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'
+%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
 %setup  -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__make} %{name} \
+	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
 	CEXTRAFLAGS="%{rpmcflags}"
 
 %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%{_appdir}/{icons,cgi-bin,html/usage,lang} \
+	$RPM_BUILD_ROOT{%{_var}/lib/%{name},%{_bindir},%{_sysconfdir}} \
+	$RPM_BUILD_ROOT%{_mandir}/man1
 
 install analog $RPM_BUILD_ROOT%{_bindir}
 install analog.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.cfg
-install lang/* $RPM_BUILD_ROOT%{_datadir}/%{name}/lang
+install lang/* $RPM_BUILD_ROOT%{_appdir}/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 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
 
-touch $RPM_BUILD_ROOT/home/httpd/html/usage/analog.html
+touch $RPM_BUILD_ROOT%{_appdir}/html/usage/analog.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%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
+%doc docs/* lang/* examples how-to
+%attr(755,root,root) %dir %{_appdir}/lang
+%attr(755,root,root) %dir %{_appdir}
+%attr(775,root,http) %dir %{_var}/lib/%{name}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.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
+%{_appdir}/lang/*.*
+%{_appdir}/icons/*.gif
+%{_appdir}/icons/*.png
+%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)
-%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 md5 mtime size) %{_appdir}/html/usage/anlgform.html
+%attr(755,root,root) %{_appdir}/cgi-bin/anlgform.pl