[sendmail] Drop sysvinit subpackage from F23+
Adam Jackson
ajax at fedoraproject.org
Tue Mar 10 18:15:06 UTC 2015
commit 7fe9dad240e692c3122c37ed9da6e80f7d621296
Author: Adam Jackson <ajax at redhat.com>
Date: Tue Mar 10 14:15:05 2015 -0400
Drop sysvinit subpackage from F23+
sendmail.spec | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/sendmail.spec b/sendmail.spec
index 924c325..f2862cf 100644
--- a/sendmail.spec
+++ b/sendmail.spec
@@ -21,7 +21,7 @@
Summary: A widely used Mail Transport Agent (MTA)
Name: sendmail
Version: 8.15.1
-Release: 2%{?dist}
+Release: 3%{?dist}
License: Sendmail
Group: System Environment/Daemons
URL: http://www.sendmail.org/
@@ -102,7 +102,9 @@ Requires(post): systemd systemd-sysv coreutils %{_sbindir}/alternatives
Requires(preun): systemd %{_sbindir}/alternatives
Requires(postun): systemd coreutils %{_sbindir}/alternatives
Requires(pre): shadow-utils
+%if 0%{?fedora} < 23
Requires: initscripts
+%endif
Requires: procmail
Requires: bash >= 2.0
Requires: setup >= 2.5.31-1
@@ -130,6 +132,7 @@ If you ever need to reconfigure Sendmail, you will also need to have
the sendmail-cf package installed. If you need documentation on
Sendmail, you can install the sendmail-doc package.
+%if 0%{?fedora} < 23
%package sysvinit
Summary: SysV initscript for sendmail
Group: System Environment/Daemons
@@ -140,6 +143,7 @@ Requires(post): chkconfig
%description sysvinit
This package contains the SysV initscript.
+%endif
%package doc
Summary: Documentation about the Sendmail Mail Transport Agent program
@@ -416,7 +420,9 @@ done
touch %{buildroot}%{maildir}/aliasesdb-stamp
install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/sendmail
+%if 0%{?fedora} < 23
install -p -m 755 %{SOURCE9} %{buildroot}%{_initrddir}/sendmail
+%endif
install -p -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/10-sendmail
install -p -m 755 %{SOURCE3} %{buildroot}%{maildir}/make
install -p -m 644 %{SOURCE5} %{buildroot}%{maildir}/Makefile
@@ -540,6 +546,7 @@ exit 0
%postun milter -p /sbin/ldconfig
+%if 0%{?fedora} < 23
%post sysvinit
/sbin/chkconfig --add sendmail >/dev/null 2>&1 ||:
@@ -551,6 +558,7 @@ fi
%postun sysvinit
[ "$1" -ge "1" ] && %{_initrddir}/sendmail condrestart >/dev/null 2>&1 ||:
+%endif
%files
%defattr(-,root,root,-)
@@ -675,11 +683,16 @@ fi
%dir %{_docdir}/sendmail/contrib
%attr(0644,root,root) %{_docdir}/sendmail/contrib/*
+%if 0%{?fedora} < 23
%files sysvinit
%defattr(-,root,root,-)
%{_initrddir}/sendmail
+%endif
%changelog
+* Tue Mar 10 2015 Adam Jackson <ajax at redhat.com> 8.15.1-3
+- Drop sysvinit subpackage from F23+
+
* Thu Feb 26 2015 Jaroslav Škarvada <jskarvad at redhat.com> - 8.15.1-2
- Removed code for transition from sysv init to systemd (deprecated)
More information about the scm-commits
mailing list