On Tue, Oct 07, 2003 at 10:23:42AM +0100, Nigel Metheringham wrote:
> On Tue, 2003-10-07 at 09:38, Andreas Metzler wrote:
> > Looks like Nigel chose to include this in the 4.24 rpm, however when
> > Upgrading from 4.22 (without alternatives support) this left me
> > without a /usr/sbin/sendmail link.
[...]
> Ah - I think I see the problem....
> in %post:-
> # make sure we have the appropriate link in
> if [ ! -f /usr/sbin/exim ]
> then
> /usr/sbin/alternatives --auto mta
> fi
>
> The ref to /usr/sbin/exim should have been /usr/sbin/sendmail
There is another bug: /usr/share/man/man1/mailq.1.gz is dangling,
because /usr/sbin/alternatives tries to link it to a nonexisting
exim.1 manpage. This (untested) patch should fix it, it also finally
uses the Phil's exim4 manpage instead of the outdated external one.
--------------
--- exim.spec.orig Wed Oct 8 13:20:29 2003
+++ exim.spec Wed Oct 8 13:41:08 2003
@@ -2,7 +2,7 @@
%define docversion 4.20
%define exiscanrev 12
%define saversion 3.1
-%define releasenum 1
+%define releasenum 2
# Deduce the major release of Red Hat we are building on
%define redhatmajorver %(rpm -q --queryformat='%{VERSION}' redhat-release|cut -d. -f1)
@@ -110,7 +110,6 @@
Source2: exim.init
Source3: exim.sysconfig
Source4: exim.logrotate
-Source5: exim.8
Source6:
ftp://ftp.exim.org/pub/exim/exim4/FAQ-html.tar.bz2
Source7:
ftp://ftp.exim.org/pub/exim/exim4/exim-html-%{docversion}.tar.bz2
Source8:
ftp://ftp.exim.org/pub/exim/exim4/exim-postscript-%{docversion}.tar.bz2
@@ -371,7 +370,10 @@
install -d -m 0750 $RPM_BUILD_ROOT/var/log/exim
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man8/exim.8
+pod2man --center=EXIM --section=8 \
+ $RPM_BUILD_ROOT/usr/sbin/eximstats \
+ $RPM_BUILD_ROOT%{_mandir}/man8/eximstats.8
+install doc/exim.8 $RPM_BUILD_ROOT%{_mandir}/man8/exim.8
mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/exim
@@ -407,10 +409,10 @@
/usr/sbin/alternatives --install /usr/sbin/sendmail mta /usr/sbin/sendmail.exim 10 \
--slave /usr/bin/mailq mta-mailq /usr/bin/mailq.exim \
--slave /usr/bin/newaliases mta-newaliases /usr/bin/newaliases.exim \
- --slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/exim.1.gz \
+ --slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man8/exim.8.gz \
--initscript exim
# make sure we have the appropriate link in
-if [ ! -f /usr/sbin/exim ]
+if [ ! -f /usr/sbin/sendmail ]
then
/usr/sbin/alternatives --auto mta
fi
@@ -561,6 +563,11 @@
%doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
%changelog
+* Wed Oct 8 2003 Nigel Metheringham <Nigel.Metheringham@???>
+- fix generation of /usr/sbin/sendmail symlink with alternatives.
+- fix symlink for mailq(1)
+- use manpages shipped by upstream.
+
* Fri May 2 2003 Nigel Metheringham <Nigel.Metheringham@???>
- Mods for RH9 build
- Now scrubs db hint files (can cause db version mismatch problems)
--------------
thanks, cu andreas
