From 04a65823d73ceb1ffb33ff5885fbca4314af5545 Mon Sep 17 00:00:00 2001
From: cvsdist <cvsdist@fedoraproject.org>
Date: Sep 09 2004 12:13:34 +0000
Subject: auto-import changelog data from sendmail-8.11.6-3.src.rpm

Fri Aug 31 2001 Florian La Roche <Florian.LaRoche@redhat.de>
- fix libmilter support
- fix init script to use /etc/mail/Makefile #52932

---

diff --git a/sendmail.init b/sendmail.init
index f0519d9..347dd09 100644
--- a/sendmail.init
+++ b/sendmail.init
@@ -37,11 +37,15 @@ start() {
 
 	echo -n $"Starting $prog: "
 	/usr/bin/newaliases > /dev/null 2>&1
-	for i in virtusertable access domaintable mailertable ; do
+	if test -x /usr/bin/make -a -f /etc/mail/Makefile ; then
+	  make -C /etc/mail -q
+	else
+	  for i in virtusertable access domaintable mailertable ; do
 	    if [ -f /etc/mail/$i ] ; then
 		makemap hash /etc/mail/$i < /etc/mail/$i
 	    fi
-	done
+	  done
+	fi
 	daemon /usr/sbin/sendmail $([ "$DAEMON" = yes ] && echo -bd) \
                                   $([ -n "$QUEUE" ] && echo -q$QUEUE)
 	RETVAL=$?
diff --git a/sendmail.spec b/sendmail.spec
index 9ed983b..5a21f35 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -3,7 +3,7 @@
 Summary: A widely used Mail Transport Agent (MTA).
 Name: sendmail
 Version: 8.11.6
-Release: 2
+Release: 3
 Copyright: BSD
 Group: System Environment/Daemons
 Provides: smtpdaemon
@@ -130,6 +130,8 @@ make DESTDIR=$RPM_BUILD_ROOT MANROOT=%{_mandir}/man SBINOWN=`id -nu` UBINOWN=`id
  install -C $OBJDIR/smrsh
 make DESTDIR=$RPM_BUILD_ROOT MANROOT=%{_mandir}/man SBINOWN=`id -nu` UBINOWN=`id -nu` SBINGRP=`id -ng` UBINGRP=`id -ng` MANOWN=`id -nu` MANGRP=`id -ng` INCOWN=`id -nu` INCGRP=`id -ng` LIBOWN=`id -nu` LIBGRP=`id -ng` \
  install -C $OBJDIR/libmilter
+make DESTDIR=$RPM_BUILD_ROOT MANROOT=%{_mandir}/man SBINOWN=`id -nu` UBINOWN=`id -nu` SBINGRP=`id -ng` UBINGRP=`id -ng` MANOWN=`id -nu` MANGRP=`id -ng` INCOWN=`id -nu` INCGRP=`id -ng` LIBOWN=`id -nu` LIBGRP=`id -ng` \
+ install -C $OBJDIR/libsmutil
 
 
 
@@ -202,8 +204,9 @@ install -m755 -d $RPM_BUILD_ROOT%{_libdir}/sasl
 install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/sasl/Sendmail.conf
 install -m 644 %{SOURCE8} $RPM_BUILD_ROOT/etc/pam.d/smtp
 
-install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/libmilter
-install -m 644  $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir}/libmilter
+install -m 755 -d $RPM_BUILD_ROOT%{_libdir}
+install -m 644  $OBJDIR/libmilter/libmilter.a $RPM_BUILD_ROOT%{_libdir}
+install -m 644  $OBJDIR/libsmutil/libsmutil.a $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -283,7 +286,8 @@ fi
 /usr/bin/mailq
 /usr/sbin/smrsh
 /usr/lib/sendmail
-/usr/lib/libmilter/libmilter.a
+/usr/lib/libmilter.a
+/usr/lib/libsmutil.a
 
 %{_mandir}/man8/rmail.8*
 %{_mandir}/man8/praliases.8*
@@ -337,6 +341,10 @@ fi
 %{_docdir}/sendmail
 
 %changelog
+* Fri Aug 31 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- fix libmilter support
+- fix init script to use /etc/mail/Makefile #52932
+
 * Sat Aug 25 2001 Florian La Roche <Florian.LaRoche@redhat.de>
 - add libmilter library