- sync with HEAD version because 0.22 dies with C=pl_PL (this version not!)

- STBR to ra-updates-general

Changed files:
    mailgraph.spec -> 1.11.2.2

diff --git a/mailgraph.spec b/mailgraph.spec
index ed7417b23ada149d45108ccdc044dbcabbbb00ba..0b9dc8de100a5d4def32e0431bf908dddc76828d 100644 (file)
--- a/mailgraph.spec
+++ b/mailgraph.spec
@@ -1,25 +1,34 @@
+#
+# TODO:
+# - write %post script with display short activatuion instruction
+#   depending on information is httpd cnfig file is vanilla or not,
+#
 %include       /usr/lib/rpm/macros.perl
 Summary:       Simple mail statistics for Postfix
 Summary(pl):   Proste statystyki dla Postfiksa
 Name:          mailgraph
-Version:       0.22
+Version:       1.8
 Release:       1
-License:       GPL
+License:       GPL v2
 Group:         Applications/Networking
 Source0:       http://people.ee.ethz.ch/~dws/software/mailgraph/pub/%{name}-%{version}.tar.gz
+# Source0-md5: f06cf84a49479529e9d280e78b7b34a9
 Source1:       %{name}.init
-Source2:       %{name}.conf
+Source2:       %{name}.sysconfig
+Source3:       %{name}.conf
 Patch0:                %{name}-paths.patch
+Patch1:                %{name}-postfix_rbl.patch
 URL:           http://people.ee.ethz.ch/~dws/software/mailgraph/
-Prereq:                /sbin/chkconfig
-Prereq:                rc-scripts
-Prereq:                grep
+PreReq:                rc-scripts
+Requires(post,preun):  /sbin/chkconfig
+Requires(post,preun):  grep
+Requires(preun):       fileutils
 Requires:      postfix
-Requires:      apache-mod_expires
-Provides:      %{name}
+BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir              /var/lib/%{name}
+%define                _httpappsdir            %{_datadir}/%{name}
 
 %description
 Mailgraph is a very simple mail statistics RRDtool frontend for
@@ -34,56 +43,60 @@ poczty wys
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig,httpd},%{_bindir}} \
+       $RPM_BUILD_ROOT{%{_httpappsdir},%{_pkglibdir}}
 
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/rc.d/init.d,/etc/httpd,/home/httpd/html/mailgraph,/home/httpd/html/mailgraph/imgs,%{_bindir}}
-
-install mailgraph.cgi $RPM_BUILD_ROOT/home/httpd/html/mailgraph/mailgraph.cgi
+install mailgraph.cgi $RPM_BUILD_ROOT%{_httpappsdir}/index.cgi
 install mailgraph.pl $RPM_BUILD_ROOT%{_bindir}/mailgraph.pl
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/mailgraph
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/httpd/%{name}.conf
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add %{name}
-if [ -f %{_sysconfdir}/httpd/httpd.conf ] && \
-        ! grep -q "^Include.*/%{name}.conf" %{_sysconfdir}/httpd/httpd.conf; then
-                echo "Include %{_sysconfdir}/httpd/%{name}.conf" >> %{_sysconfdir}/httpd/httpd.conf
-        if [ -f /var/lock/subsys/httpd ]; then
-                /etc/rc.d/init.d/httpd restart 1>&2
-        fi
+if [ -f /etc/httpd/httpd.conf ] && \
+     ! grep -q "^Include.*/%{name}.conf" /etc/httpd/httpd.conf; then
+       echo "Include /etc/httpd/%{name}.conf" >> /etc/httpd/httpd.conf
+       if [ -f /var/lock/subsys/httpd ]; then
+               /etc/rc.d/init.d/httpd restart 1>&2
+       fi
 fi
 if [ -f /var/lock/subsys/%{name} ]; then
-        /etc/rc.d/init.d/%{name} restart 1>&2
+       /etc/rc.d/init.d/%{name} restart 1>&2
 else
-        echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
+       echo "Run \"/etc/rc.d/init.d/%{name} start\" to start %{name} daemon."
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       grep -E -v "^Include.*%{name}.conf" %{_sysconfdir}/httpd/httpd.conf > \
-               %{_sysconfdir}/httpd/httpd.conf.tmp
-       mv -f %{_sysconfdir}/httpd/httpd.conf.tmp %{_sysconfdir}/httpd/httpd.conf
+       umask 027
+       grep -E -v "^Include.*%{name}.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
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
        if [ -f /var/lock/subsys/%{name} ]; then
-               /etc/rc.d/init.d/%{name} stop 1>&2
-       fi
+               /etc/rc.d/init.d/%{name} stop 1>&2
+       fi
        /sbin/chkconfig --del %{name}
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(644,root,root,755)
+%doc README CHANGES
 %attr(755,root,root) %{_bindir}/mailgraph.pl
-%attr(755,root,root) /home/httpd/html/mailgraph/mailgraph.cgi
 %attr(754,root,root) /etc/rc.d/init.d/mailgraph
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/mailgraph.conf
-%dir %{_pkglibdir}
-%attr(771,root,http) %dir /home/httpd/html/mailgraph/imgs
-%doc README CHANGES
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/mailgraph
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/httpd/mailgraph.conf
+%dir %{_httpappsdir}
+%attr(755,root,root) %{_httpappsdir}/index.cgi
+%attr(750,root,http) %dir %{_pkglibdir}