[postgrey/el6] Update to 1.34 and spec file cleanups

[Matthias Saou]

commit beadb5ce354128f79278ecd66fedef0d5c96f627
Author: Matthias Saou <matthias at saou.eu>
Date:   Tue Apr 3 10:54:21 2012 +0200

    Update to 1.34 and spec file cleanups

 .gitignore    |    3 ++-
 postgrey.spec |   46 ++++++++++++++++++++++++++--------------------
 sources       |    2 +-
 3 files changed, 29 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 86aad99..80a73a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-postgrey-1.32.tar.gz
+/postgrey-1.32.tar.gz
+/postgrey-1.34.tar.gz
diff --git a/postgrey.spec b/postgrey.spec
index 9374ee3..0e4486b 100644
--- a/postgrey.spec
+++ b/postgrey.spec
@@ -2,8 +2,8 @@
 
 Summary: Postfix Greylisting Policy Server
 Name: postgrey
-Version: 1.32
-Release: 2%{?dist}
+Version: 1.34
+Release: 1%{?dist}
 # File headers only state "GNU GPL", but the LICENSE sections state v2 and "any
 # later version"
 License: GPLv2+
@@ -34,7 +34,7 @@ again later, as it is however required per RFC.
 %prep
 %setup -q
 %patch0 -p1 -b .group
-%{__install} -p -m 0644 %{SOURCE2} README-rpm
+install -p -m 0644 %{SOURCE2} README-rpm
 
 
 %build
@@ -46,37 +46,37 @@ pod2man \
 
 
 %install
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 # Configuration files
-%{__mkdir_p} %{buildroot}%{confdir}
-%{__install} -p -m 0644 postgrey_whitelist_{clients,recipients} \
+mkdir -p %{buildroot}%{confdir}
+install -p -m 0644 postgrey_whitelist_{clients,recipients} \
     %{buildroot}%{confdir}/
 # Local whitelist file
 echo "# Clients that should not be greylisted.  See postgrey(8)." \
     > %{buildroot}%{confdir}/postgrey_whitelist_clients.local
 
 # Main script
-%{__install} -D -p -m 0755 postgrey %{buildroot}%{_sbindir}/postgrey
+install -D -p -m 0755 postgrey %{buildroot}%{_sbindir}/postgrey
 
 # Spool directory
-%{__mkdir_p} %{buildroot}%{_var}/spool/postfix/postgrey
+mkdir -p %{buildroot}%{_var}/spool/postfix/postgrey
 
 # Init script
-%{__install} -D -p -m 0755 %{SOURCE1} \
+install -D -p -m 0755 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/postgrey
 
 # Man page
-%{__install} -D -p -m 0644 postgrey.8 \
+install -D -p -m 0644 postgrey.8 \
     %{buildroot}%{_mandir}/man8/postgrey.8
 
 # Optional report script
-%{__install} -D -p -m 0755 contrib/postgreyreport \
+install -D -p -m 0755 contrib/postgreyreport \
     %{buildroot}%{_sbindir}/postgreyreport
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 
 %pre
@@ -112,10 +112,16 @@ fi
 
 
 %changelog
+* Tue Jun  7 2011 Matthias Saou <matthias at saou.eu> 1.34-1
+- Update to 1.34.
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.32-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.32-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Sun Apr 12 2009 Matthias Saou <http://freshrpms.net/> 1.32-1
+* Sun Apr 12 2009 Matthias Saou <matthias at saou.eu> 1.32-1
 - Update to 1.32.
 - Update init script to the new style.
 - Slightly update README-rpm instructions.
@@ -123,31 +129,31 @@ fi
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Thu May 22 2008 Matthias Saou <http://freshrpms.net/> 1.31-1
+* Thu May 22 2008 Matthias Saou <matthias at saou.eu> 1.31-1
 - Update to 1.31.
 
-* Mon Aug  6 2007 Matthias Saou <http://freshrpms.net/> 1.30-1
+* Mon Aug  6 2007 Matthias Saou <matthias at saou.eu> 1.30-1
 - Update to 1.30.
 - Update License field.
 
-* Fri Jun 22 2007 Matthias Saou <http://freshrpms.net/> 1.28-1
+* Fri Jun 22 2007 Matthias Saou <matthias at saou.eu> 1.28-1
 - Update to 1.28.
 - Update URL to the new homepage.
 
-* Mon Feb 12 2007 Matthias Saou <http://freshrpms.net/> 1.27-4
+* Mon Feb 12 2007 Matthias Saou <matthias at saou.eu> 1.27-4
 - Silence %%setup.
 - Fix init script mode in the srpm.
 - Remove explicit perl(IO::Multiplex) requirement, not needed on FC6 (but
   probably still on RHEL4).
 - Add a comment line to the empty local whitelist file.
 
-* Mon Dec  4 2006 Matthias Saou <http://freshrpms.net/> 1.27-3
+* Mon Dec  4 2006 Matthias Saou <matthias at saou.eu> 1.27-3
 - Add man page generation (Mike Wohlgemuth).
 
-* Fri Dec  1 2006 Matthias Saou <http://freshrpms.net/> 1.27-2
+* Fri Dec  1 2006 Matthias Saou <matthias at saou.eu> 1.27-2
 - Include postgreyreport script.
 
-* Mon Nov  6 2006 Matthias Saou <http://freshrpms.net/> 1.27-1
+* Mon Nov  6 2006 Matthias Saou <matthias at saou.eu> 1.27-1
 - Spec file cleanup.
 
 * Wed Jan 18 2006 Levente Farkas <lfarkas at lfarkas.org> 1.24
diff --git a/sources b/sources
index 03fa10b..257cc49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-524a4e165bf997996f3bccade394712f  postgrey-1.32.tar.gz
+f736a7be1094593f1a66cd13f32b39ef  postgrey-1.34.tar.gz