From 52938ede926dab25656b8d46e25f9c22ddea5f05 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@fedoraproject.org>
Date: Tue, 11 Apr 2006 15:48:17 +0000
Subject: [PATCH] [tw] - new version 2.2.10 - added option LDAP_DEPRECATED to
 support deprecated ldap functions for now - fixed build without pflogsumm
 support (#188470)

---
 .cvsignore   |  2 +-
 postfix.spec | 13 ++++++++++---
 sources      |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f17373b..679163e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
 pflogsumm-1.1.0.tar.gz
-postfix-2.2.8.tar.gz
+postfix-2.2.10.tar.gz
diff --git a/postfix.spec b/postfix.spec
index feedd27..cafd26e 100644
--- a/postfix.spec
+++ b/postfix.spec
@@ -42,8 +42,8 @@
 
 Name: postfix
 Summary: Postfix Mail Transport Agent
-Version: 2.2.8
-Release: 1.2
+Version: 2.2.10
+Release: 1
 Epoch: 2
 Group: System Environment/Daemons
 URL: http://www.postfix.org
@@ -62,8 +62,10 @@ Source3: README-Postfix-SASL-RedHat.txt
 
 # Sources 50-99 are upstream [patch] contributions
 
+%if %{PFLOGSUMM}
 # Postfix Log Entry Summarizer: http://jimsun.linxnet.com/postfix_contrib.html
 Source53: http://jimsun.linxnet.com/downloads/pflogsumm-%{pflogsumm_ver}.tar.gz
+%endif
 
 # Sources >= 100 are config files
 
@@ -165,7 +167,7 @@ CCARGS="${CCARGS} -fsigned-char"
 %endif
 
 %if %{LDAP}
-  CCARGS="${CCARGS} -DHAS_LDAP"
+  CCARGS="${CCARGS} -DHAS_LDAP -DLDAP_DEPRECATED=1"
   AUXLIBS="${AUXLIBS} -L%{_libdir} -lldap -llber"
 %endif
 %if %{PCRE}
@@ -467,6 +469,11 @@ exit 0
 
 
 %changelog
+* Tue Apr 11 2006 Thomas Woerner <twoerner@redhat.com> 2:2.2.10-1
+- new version 2.2.10
+- added option LDAP_DEPRECATED to support deprecated ldap functions for now
+- fixed build without pflogsumm support (#188470)
+
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2:2.2.8-1.2
 - bump again for double-long bug on ppc(64)
 
diff --git a/sources b/sources
index e844607..3fe05c8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1f78fcaf2a36ec3520ecff286a45251a  pflogsumm-1.1.0.tar.gz
-971bf94de3e8433c8965c27b42d56b9a  postfix-2.2.8.tar.gz
+440a4702182a79ac2f51e8974fb742c9  postfix-2.2.10.tar.gz