X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavis-stats.spec;h=d0199f3337fe325a4ed80abba6ca63f77314be5c;hb=cbcba574078778b20559e7d841986a55f795fb34;hp=d5c7ca1530e0d025c3d8fab594eca8e9be6127f7;hpb=a633488423975b57e89368d7ba67db5a5e778524;p=packages%2Famavis-stats.git

diff --git a/amavis-stats.spec b/amavis-stats.spec
index d5c7ca1..d0199f3 100644
--- a/amavis-stats.spec
+++ b/amavis-stats.spec
@@ -1,106 +1,139 @@
 %include	/usr/lib/rpm/macros.perl
 Summary:	Simple amavisd-new statistics generator
-Summary(pl):	Prosty generator statystyk dla amavisd-new
+Summary(pl.UTF-8):	Prosty generator statystyk dla amavisd-new
 Name:		amavis-stats
-Version:	0.1.12
-Release:	1
+Version:	0.1.22
+Release:	0.1
 License:	GPL
 Group:		Applications/System
-Source0:	http://rekudos.net/download/%{name}-%{version}.tar.gz
-# Source0-md5:	b85063b3bb8ecdb03d1b7aebf0c0a6cd
+Source0:	http://downloads.topicdesk.com/amavis_stats/%{name}-%{version}.tar.gz
+# Source0-md5:	5bea6811c00a4fda4b96b6a318a04a92
 Source1:	%{name}.cron
 Patch0:		%{name}-gzip.patch
-Patch1:		%{name}-more_ac.patch
-URL:		http://rekudos.net/amavis-stats/
-BuildArch:	noarch
+Patch1:		%{name}-Makefile.patch
+URL:		http://osx.topicdesk.com/content/view/42/59/
+BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sed >= 4.0
 Provides:	%{name}-%{version}-%{release}
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir		/var/lib/%{name}
-%define		_phpdir			/usr/share/%{name}
+%define		_pkglibdir	/var/lib/%{name}
+%define		_pkgcachedir	/var/cache/%{name}
+%define		_webapps	/etc/webapps
+%define		_webapp		%{name}
+%define		_webappdir	%{_webapps}/%{_webapp}
+%define		_appdir		%{_datadir}/%{_webapp}
 
 %description
 amavis-stats is a simple amavis statistics generator based on rrdtool.
 It produces graphs from amavisd-new log entries of infections broken
 down by virus.
 
-%description -l pl
+%description -l pl.UTF-8
 amavis-stats jest prostym generatorem statystyk opartym na rrdtool.
-Tworzy wykresy zainfekowanych wiadomo¶ci, w rozbiciu na poszczególne
-wirusy, na podstawie logów amavisd-new.
+Tworzy wykresy zainfekowanych wiadomości, w rozbiciu na poszczególne
+wirusy, na podstawie logów amavisd-new.
 
 %package php
 Summary:	PHP interface for amavis-stats
-Summary(pl):	Interfejs PHP dla amavis-stats
+Summary(pl.UTF-8):	Interfejs PHP dla amavis-stats
 Group:		Applications/System
 Requires:	%{name}-%{version}-%{release}
+Requires:	php(pcre)
+Requires:	webapps
+Requires:	webserver(php)
 
 %description php
 PHP interface for amavis-stats.
 
-%description php -l pl
+%description php -l pl.UTF-8
 Interfejs PHP dla amavis-stats.
 
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 
 %build
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+sed -i -e '/basic_machine=powerpc-apple/s/$/\n\t\t;;\n\tnoarch-*)\n\t\tbasic_machine=noarch/;' config.sub
+%configure \
+	--with-user=http \
+	--with-group=http \
+	--with-log-file=/var/log/maillog
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/cron.d
-user=`id -u`
-group=`id -g`
 
 %{__make} install \
-	install_prefix=$RPM_BUILD_ROOT \
-	amavis_user=$user \
-	amavis_group=$group \
-	web_user=$user \
-	web_group=$group
-	
+	DESTDIR=$RPM_BUILD_ROOT
+
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/amavis-stats
+install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
+mv $RPM_BUILD_ROOT{%{_datadir}/amavis-stats/amavis-stats.alias.conf,%{_webapps}/%{_webapp}/httpd.conf}
+mv $RPM_BUILD_ROOT{%{_datadir}/amavis-stats/amavis-stats.php.conf,%{_webapps}/%{_webapp}}
+ln -s %{_webapps}/%{_webapp}/amavis-stats.php.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/amavis-stats.php.conf
+cp $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/{httpd,apache}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post php
-if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*/etc/%{name}/apache.conf" /etc/httpd/httpd.conf; then
-	echo "Include /etc/%{name}/apache.conf" >> /etc/httpd/httpd.conf
-fi
-if [ -f /var/lock/subsys/httpd ]; then
-	/usr/sbin/apachectl restart 1>&2
+%triggerin php -- apache1 < 1.3.37-3, apache1-base
+%webapp_register apache %{_webapp}
+
+%triggerun php -- apache1 < 1.3.37-3, apache1-base
+%webapp_unregister apache %{_webapp}
+
+%triggerin php -- apache < 2.2.0, apache-base
+%webapp_register httpd %{_webapp}
+
+%triggerun php -- apache < 2.2.0, apache-base
+%webapp_unregister httpd %{_webapp}
+
+%triggerpostun php -- %{name}-php < 0.1.13-0.rc6.4.1
+if [ -f /etc/httpd/httpd.conf ]; then
+	sed -i -e "/^Include.*%{name}\/apache.conf/d" /etc/httpd/httpd.conf
 fi
 
-%preun php
-if [ "$1" = "0" ]; then
-	umask 027
-	grep -v "^Include.*/etc/%{name}/apache.conf" /etc/httpd/httpd.conf > \
-		etc/httpd/httpd.conf.tmp
-	mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
-	if [ -f /var/lock/subsys/httpd ]; then
-		/usr/sbin/apachectl restart 1>&2
-	fi
+if [ -f /etc/%{name}/apache.conf.rpmsave ]; then
+	cp -f %{_webapps}/%{_webapp}/httpd.conf{,.rpmnew}
+	mv -f /etc/%{name}/apache.conf.rpmsave %{_webapps}/%{_webapp}/httpd.conf
 fi
 
+rm -f /etc/httpd/httpd.conf/99_%{name}.conf
+/usr/sbin/webapp register httpd %{_webapp}
+%service -q httpd reload
+
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README ChangeLog
 %attr(755,root,root) %{_sbindir}/amavis-stats
 %dir %{_pkglibdir}
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/cron.d/amavis-stats
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/amavis-stats
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/amavis-stats.conf
 %{_mandir}/man1/*
 
 %files php
 %defattr(644,root,root,755)
-%dir /etc/%{name}
-%attr(640,root,root) %config(noreplace) /etc/%{name}/apache.conf
-%dir %{_phpdir}
-%dir %attr(755,http,root) %{_phpdir}/img
-%{_phpdir}/%{name}.php
-%{_phpdir}/index.php
-%attr(755,http,http) %dir %{_pkglibdir}/img
+%dir %attr(750,root,http) %{_webapps}/%{_webapp}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/amavis-stats.php.conf
+%dir %{_appdir}
+%{_appdir}/amavis-stats.php.conf
+%{_appdir}/img
+%{_appdir}/includes
+%{_appdir}/index.php
+%{_appdir}/templates
+%{_appdir}/%{name}.php
+%{_appdir}/%{name}.html
+%{_appdir}/*.png
+%{_appdir}/*.ttf
+%attr(775,root,http) %dir %{_pkgcachedir}