rpms/exim/devel exim-tidydb.sh,NONE,1.1 exim.spec,1.58,1.59
David Woodhouse
dwmw2 at fedoraproject.org
Wed Aug 12 11:08:58 UTC 2009
Author: dwmw2
Update of /cvs/pkgs/rpms/exim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6050
Modified Files:
exim.spec
Added Files:
exim-tidydb.sh
Log Message:
Various small fixes
--- NEW FILE exim-tidydb.sh ---
#!/bin/bash
SPOOLDIR=/var/spool/exim
cd $SPOOLDIR/db
for a in retry misc wait-* callout ratelimit; do
[ -r "$a" ] || continue
[ "${a%%.lockfile}" = "$a" ] || continue
/usr/sbin/exim_tidydb $SPOOLDIR $a >/dev/null
done
Index: exim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/exim/devel/exim.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- exim.spec 24 Jul 2009 22:25:29 -0000 1.58
+++ exim.spec 12 Aug 2009 11:08:58 -0000 1.59
@@ -29,6 +29,7 @@ Source: ftp://ftp.exim.org/pub/exim/exim
Source2: exim.init
Source3: exim.sysconfig
Source4: exim.logrotate
+Source5: exim-tidydb.sh
Source11: exim.pam
%if 0%{?buildsa}
Source13: http://marc.merlins.org/linux/exim/files/sa-exim-4.2.tar.gz
@@ -53,11 +54,15 @@ Patch23: exim-4.67-smarthost-config.patc
Patch24: exim-4.69-dynlookup.patch
Patch25: exim-4.69-dynlookup-config.patch
+Requires: /etc/pki/tls/certs /etc/pki/tls/private
Requires: /etc/aliases
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
-BuildRequires: lynx pcre-devel sqlite-devel tcp_wrappers-devel
-BuildRequires: cyrus-sasl-devel openldap-devel openssl-devel mysql-devel postgresql-devel
+%if 0%{?buildsa}
+BuildRequires: lynx
+%endif
+BuildRequires: pcre-devel sqlite-devel tcp_wrappers-devel cyrus-sasl-devel
+BuildRequires: openldap-devel openssl-devel mysql-devel postgresql-devel
BuildRequires: libXaw-devel libXmu-devel libXext-devel libX11-devel libSM-devel
BuildRequires: libICE-devel libXpm-devel libXt-devel perl(ExtUtils::Embed)
@@ -269,6 +274,9 @@ install %SOURCE2 $RPM_BUILD_ROOT%{_initr
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
install -m 0644 %SOURCE4 $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/exim
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily
+install -m 0755 %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/cron.daily/exim-tidydb
+
%if 0%{?buildsa}
# install sa
cd sa-exim*
@@ -303,6 +311,9 @@ EOF
ln -sf clamd $RPM_BUILD_ROOT/usr/sbin/clamd.exim
mkdir -p $RPM_BUILD_ROOT%{_var}/run/clamd.exim
+mkdir -p $RPM_BUILD_ROOT%{_var}/log
+touch $RPM_BUILD_ROOT%{_var}/log/clamd.exim
+
%endif
# Set up the greylist subpackage
@@ -430,6 +441,7 @@ fi
%{_sysconfdir}/rc.d/init.d/exim
%config(noreplace) %{_sysconfdir}/logrotate.d/exim
%config(noreplace) %{_sysconfdir}/pam.d/exim
+%{_sysconfdir}/cron.daily/exim-tidydb
%doc ACKNOWLEDGMENTS LICENCE NOTICE README.UPDATING README
%doc doc util/unknownuser.sh
@@ -461,6 +473,8 @@ fi
%if 0%{?buildclam}
%post clamav
+/bin/touch %{_var}/log/clamd.exim
+/bin/chown exim.exim %{_var}log/clamd.exim
/sbin/chkconfig --add clamd.exim
%preun clamav
@@ -478,6 +492,7 @@ test "$1" = 0 || %{_initrddir}/clamd.ex
%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim
%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim
%attr(0750,exim,exim) %dir %{_var}/run/clamd.exim
+%ghost %attr(0644,exim,exim) %{_var}/log/clamd.exim
%endif
%files greylist
@@ -488,6 +503,12 @@ test "$1" = 0 || %{_initrddir}/clamd.ex
%{_sysconfdir}/cron.daily/greylist-tidy.sh
%changelog
+* Wed Aug 12 2009 David Woodhouse <David.Woodhouse at intel.com> - 4.69-13
+- Cope with lack of /etc/sysconfig/network (#506330)
+- Require /etc/pki/tls/ directories
+- Provide exim-tidydb cron job (#481426)
+- Provide clamd.exim log file (#452358)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.69-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the fedora-extras-commits
mailing list