[milter-greylist] Doc updates, preset support for EL-7 builds

[Paul Howarth]

commit 4a0c5ee518a99df726ae5fee560cbb15d5fcdeaf
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Mar 6 16:42:44 2015 +0000

    Doc updates, preset support for EL-7 builds
    
    - Include milter-greylist.m4 as %doc
    - Add preset support for EL-7 build
    - Tag README as %license where possible as it includes the license details

 milter-greylist.spec | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/milter-greylist.spec b/milter-greylist.spec
index 30c1ee0..4112f52 100644
--- a/milter-greylist.spec
+++ b/milter-greylist.spec
@@ -20,7 +20,7 @@
 Summary:		Milter for greylisting, the next step in the spam control war
 Name:			milter-greylist
 Version:		4.5.12
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		BSD with advertising
 Group:			System Environment/Daemons
 URL:			http://hcpnet.free.fr/milter-greylist/
@@ -82,7 +82,7 @@ This package provides a greylist filter for sendmail's milter API.
 # Work around warning about _BSD_SOURCE being deprecated in favor
 # of _DEFAULT_SOURCE breaking build due to use of -Werror
 # (patch breaks builds with EL < 7)
-%if 0%{?fedora} > 20
+%if 0%{?fedora} > 20 || 0%{?rhel} > 6
 %patch2
 %endif
 
@@ -180,7 +180,7 @@ if [ $1 -eq 1 ]; then
 %if ! %{use_systemd}
 	/sbin/chkconfig --add milter-greylist || :
 %endif
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 	/bin/systemctl preset milter-greylist.service >/dev/null 2>&1 || :
 %endif
 fi
@@ -211,7 +211,12 @@ if [ $1 -ge 1 ]; then
 fi
 
 %files
-%doc ChangeLog README README.fedora
+%if 0%{?_licensedir:1}
+%license README
+%else
+%doc README
+%endif
+%doc ChangeLog README.fedora milter-greylist.m4
 %{_sbindir}/milter-greylist
 %attr(0640,root,grmilter) %verify(not mtime) %config(noreplace) %{_sysconfdir}/mail/greylist.conf
 %dir %attr(0751,grmilter,grmilter) %{_localstatedir}/lib/milter-greylist/
@@ -233,6 +238,11 @@ fi
 %endif
 
 %changelog
+* Fri Mar  6 2015 Paul Howarth <paul at city-fan.org> - 4.5.12-2
+- Include milter-greylist.m4 as %%doc
+- Add preset support for EL-7 build
+- Tag README as %%license where possible as it includes the license details
+
 * Thu Dec 18 2014 Paul Howarth <paul at city-fan.org> - 4.5.12-1
 - Update to 4.5.12
   - Prevent buffer overflow on IP address in DRAC code