X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=amavis-stats.spec;h=cfd9f7f8927f704f478aea6956b80d81a586c59d;hb=f9f953eac1b427606fcfbd2f82a9242dd2bb544c;hp=02c9cde1eaaaf0d3a10df7674440999c86c7080e;hpb=87db9fdf463ec9d66e95faf2d2f56d45c00d6162;p=packages%2Famavis-stats.git

diff --git a/amavis-stats.spec b/amavis-stats.spec
index 02c9cde..cfd9f7f 100644
--- a/amavis-stats.spec
+++ b/amavis-stats.spec
@@ -1,3 +1,8 @@
+#
+# TODO:
+#   - add init script
+#   - add trigger to update apache configuration
+#
 %include	/usr/lib/rpm/macros.perl
 Summary:	Simple amavisd-new statistics generator
 Summary(pl.UTF-8):	Prosty generator statystyk dla amavisd-new
@@ -8,13 +13,14 @@ License:	GPL
 Group:		Applications/System
 Source0:	http://downloads.topicdesk.com/amavis_stats/%{name}-%{version}.tar.gz
 # Source0-md5:	5bea6811c00a4fda4b96b6a318a04a92
-Source1:	%{name}.cron
 Patch0:		%{name}-gzip.patch
 Patch1:		%{name}-Makefile.patch
+Patch2:		%{name}-pid.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
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_pkglibdir	/var/lib/%{name}
@@ -53,6 +59,7 @@ Interfejs PHP dla amavis-stats.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -60,6 +67,7 @@ Interfejs PHP dla amavis-stats.
 %{__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 \
@@ -68,12 +76,10 @@ Interfejs PHP dla amavis-stats.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/cron.d
 
 %{__make} install \
 	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}}
@@ -114,7 +120,6 @@ rm -f /etc/httpd/httpd.conf/99_%{name}.conf
 %doc README ChangeLog
 %attr(755,root,root) %{_sbindir}/amavis-stats
 %dir %{_pkglibdir}
-%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/*