[sendmail] * Wed Aug 04 2010 Jaroslav Å karvada <jskarvad at redhat.com> - 8.14.4-10 - added stub man pages for ho

Jaroslav Škarvada jskarvad at fedoraproject.org
Fri Aug 6 09:31:14 UTC 2010 

commit d89cc2df32c5164dec5a6e53d1016b716e249aad
Author: yarda <yarda at dhcp-30-156.brq.redhat.com>
Date:   Fri Aug 6 11:30:00 2010 +0200

    * Wed Aug 04 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.4-10
    - added stub man pages for hoststat and purgestat
    - rmail man page added to alternatives
    - updated subpackages description
    - sendmail-cf/cf/README is not packaged - it is useless for end users
    - added comments about purpose of files and patches
    - removed redundant license tag from milter subpackage

 sendmail-8.13.7-pid.patch |    2 +-
 sendmail.spec             |   65 ++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 59 insertions(+), 8 deletions(-)
---
diff --git a/sendmail-8.13.7-pid.patch b/sendmail-8.13.7-pid.patch
index e5955ea..0025923 100644
--- a/sendmail-8.13.7-pid.patch
+++ b/sendmail-8.13.7-pid.patch
@@ -4,7 +4,7 @@
  #
  
  divert(0)dnl
--VERSIONID(`$Id: sendmail-8.13.7-pid.patch,v 1.2 2007/08/27 10:25:00 twoerner Exp $')
+-VERSIONID(`$Id: submit.mc,v 8.14 2006/04/05 05:54:41 ca Exp $')
 +sinclude(`/usr/share/sendmail-cf/m4/cf.m4')dnl
 +VERSIONID(`linux setup')dnl
  define(`confCF_VERSION', `Submit')dnl
diff --git a/sendmail.spec b/sendmail.spec
index 537db70..d2ec496 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -14,42 +14,74 @@
 Summary: A widely used Mail Transport Agent (MTA)
 Name: sendmail
 Version: 8.14.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: Sendmail
 Group: System Environment/Daemons
 URL: http://www.sendmail.org/
 Source0: ftp://ftp.sendmail.org/pub/sendmail/sendmail.%{version}.tar.gz
+# init script
 Source1: sendmail.init
+# NetworkManager dispatch script
 Source2: sendmail.nm-dispatcher
+# script to generate db and cf files
 Source3: sendmail.etc-mail-make
+# default sysconfig file
 Source4: sendmail.sysconfig
+# default /etc/mail/Makefile
 Source5: sendmail.etc-mail-Makefile
+# default sendmail.mc
 Source6: sendmail-redhat.mc
+# pam config
 Source8: sendmail.pam
+# readme about email delivery
 Source9: sendmail-8.12.5-newconfig.readme
+# sasl2 config
 Source11: Sendmail-sasl2.conf
+# default /etc/mail/access
 Source12: sendmail-etc-mail-access
+# default /etc/mail/domaintable
 Source13: sendmail-etc-mail-domaintable
+# default /etc/mail/local-host-names
 Source14: sendmail-etc-mail-local-host-names
+# default /etc/mail/mailertable
 Source15: sendmail-etc-mail-mailertable
+# default /etc/mail/trusted-users
 Source16: sendmail-etc-mail-trusted-users
+# default /etc/mail/virtusertable
 Source17: sendmail-etc-mail-virtusertable
+# fix man path and makemap man page
 Patch3: sendmail-8.14.4-makemapman.patch
+# fix smrsh paths
 Patch4: sendmail-8.14.3-smrsh_paths.patch
+# fix sm-client.pid path
 Patch7: sendmail-8.13.7-pid.patch
+# do not reject all numeric login names if hesiod support is compiled in, #80060
 Patch9: sendmail-8.12.7-hesiod.patch
+# fix sendmail man page
 Patch10: sendmail-8.12.7-manpage.patch
+# compile with -fpie
 Patch11: sendmail-8.14.4-dynamic.patch
+# fix cyrus path
 Patch12: sendmail-8.13.0-cyrus.patch
+# fix aliases.db path
 Patch13: sendmail-8.14.4-aliases_dir.patch
+# fix vacation Makefile
 Patch14: sendmail-8.13.7-vacation.patch
+# remove version information from sendmail helpfile
 Patch15: sendmail-8.14.1-noversion.patch
+# do not accept localhost.localdomain as valid address from smtp
 Patch16: sendmail-8.13.1-localdomain.patch
+# build libmilter as DSO
 Patch17: sendmail-8.14.3-sharedmilter.patch
+# skip colon separator when parsing service name in ServiceSwitchFile
 Patch18: sendmail-8.14.4-switchfile.patch
+# fix milter file descriptors leaks, #485426
 Patch20: sendmail-8.14.3-milterfdleaks.patch
+# handle IPv6:::1 in block_bad_helo.m4 like 127.0.0.1, #549217
 Patch21: sendmail-8.14.3-ipv6-bad-helo.patch
+# fix compilation with libdb5
 Patch22: sendmail-8.14.4-libdb5.patch
+# silence warning about missing sasl2 config in /usr/lib*, now in /etc/sasl2
 Patch23: sendmail-8.14.4-sasl2-in-etc.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: tcp_wrappers-devel
@@ -99,9 +131,8 @@ Requires: sendmail = %{version}-%{release}
 
 %description doc
 The sendmail-doc package contains documentation about the Sendmail
-Mail Transport Agent (MTA) program, including release notes, the
-Sendmail FAQ, and a few papers written about Sendmail. The papers are
-provided in PDF and troff formats.
+Mail Transport Agent (MTA) program, including release notes, and a few
+papers written about Sendmail.
 
 %package devel
 Summary: Extra development include files and development files
@@ -110,7 +141,7 @@ Requires: sendmail = %{version}-%{release}
 Requires: sendmail-milter = %{version}-%{release}
 
 %description devel
-Include files and devel libraries for e.g. the milter addons as part
+Include files and devel libraries for e.g. the milter add-ons as part
 of sendmail.
 
 %package cf
@@ -128,7 +159,6 @@ your sendmail.cf file.
 
 %package milter
 Summary: The sendmail milter library
-License: Sendmail
 Group: System Environment/Libraries
 
 %description milter
@@ -333,6 +363,8 @@ cp -ar cf/* %{buildroot}%{sendmailcf}
 rm -rf %{buildroot}%{sendmailcf}/cf/Build.*
 rm -rf %{buildroot}%{sendmailcf}/*/*.mc.*
 rm -rf %{buildroot}%{sendmailcf}/*/*.m4.*
+# remove cf/README file because it is useless for end users
+rm -f %{buildroot}%{sendmailcf}/cf/README
 
 # install sendmail.mc with proper paths
 install -m 644 %{SOURCE6} %{buildroot}%{maildir}/sendmail.mc
@@ -406,9 +438,16 @@ mv %{buildroot}%{_mandir}/man5/aliases.5 %{buildroot}%{_mandir}/man5/aliases.sen
 touch %{buildroot}%{_mandir}/man5/aliases.5
 mv %{buildroot}%{_mandir}/man8/sendmail.8 %{buildroot}%{_mandir}/man8/sendmail.sendmail.8
 touch %{buildroot}%{_mandir}/man8/sendmail.8
+mv %{buildroot}%{_mandir}/man8/rmail.8 %{buildroot}%{_mandir}/man8/rmail.sendmail.8
+touch %{buildroot}%{_mandir}/man8/rmail.8
 touch %{buildroot}/usr/lib/sendmail
 touch %{buildroot}%{_sysconfdir}/pam.d/smtp
 
+# create stub man pages
+for m in man8/hoststat.8 man8/purgestat.8; do
+	[ -f %{buildroot}%{_mandir}/$m ] || 
+		echo ".so man8/sendmail.8" > %{buildroot}%{_mandir}/$m
+done
 
 %clean
 rm -rf %{buildroot}
@@ -449,6 +488,7 @@ exit 0
 	--slave %{_mandir}/man1/mailq.1.gz mta-mailqman %{_mandir}/man1/mailq.sendmail.1.gz \
 	--slave %{_mandir}/man1/newaliases.1.gz mta-newaliasesman %{_mandir}/man1/newaliases.sendmail.1.gz \
 	--slave %{_mandir}/man5/aliases.5.gz mta-aliasesman %{_mandir}/man5/aliases.sendmail.5.gz \
+	--slave %{_mandir}/man8/rmail.8.gz mta-rmailman %{_mandir}/man8/rmail.sendmail.8.gz \
 	--initscript sendmail
 
 # Rebuild maps.
@@ -501,12 +541,14 @@ exit 0
 %{_sbindir}/smrsh
 /usr/lib/sendmail.sendmail
 
-%{_mandir}/man8/rmail.8.gz
+%{_mandir}/man8/rmail.sendmail.8.gz
 %{_mandir}/man8/praliases.8.gz
 %{_mandir}/man8/mailstats.8.gz
 %{_mandir}/man8/makemap.8.gz
 %{_mandir}/man8/sendmail.sendmail.8.gz
 %{_mandir}/man8/smrsh.8.gz
+%{_mandir}/man8/hoststat.8.gz
+%{_mandir}/man8/purgestat.8.gz
 %{_mandir}/man5/aliases.sendmail.5.gz
 %{_mandir}/man1/newaliases.sendmail.1.gz
 %{_mandir}/man1/mailq.sendmail.1.gz
@@ -523,6 +565,7 @@ exit 0
 %ghost %{_mandir}/man1/mailq.1.gz
 %ghost %{_mandir}/man1/newaliases.1.gz
 %ghost %{_mandir}/man5/aliases.5.gz
+%ghost %{_mandir}/man8/rmail.8.gz
 
 %dir %{stdir}
 %dir %{_sysconfdir}/smrsh
@@ -602,6 +645,14 @@ exit 0
 
 
 %changelog
+* Wed Aug 04 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.4-10
+- added stub man pages for hoststat and purgestat
+- rmail man page added to alternatives
+- updated subpackages description
+- sendmail-cf/cf/README is not packaged - it is useless for end users
+- added comments about purpose of files and patches
+- removed redundant license tag from milter subpackage
+
 * Thu Jul 08 2010 Jaroslav Škarvada <jskarvad at redhat.com> - 8.14.4-9
 - added license to milter subpackage according to new Licensing
   Guidelines

More information about the scm-commits mailing list