From 29eef2d44f7fbc34b0b5cf7c20b7b54e5bfb2367 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 7 Apr 2006 15:12:06 +0000
Subject: [PATCH] - Only warn about ACLs once (STR #1532).

---
 cups.spec | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/cups.spec b/cups.spec
index 492b327..b7857ec 100644
--- a/cups.spec
+++ b/cups.spec
@@ -43,6 +43,7 @@ Patch19: cups-gnome.patch
 Patch20: cups-direct-usb.patch
 Patch21: cups-pstops.patch
 Patch22: cups-dest-cache-v2.patch
+Patch23: cups-str1532.patch
 Patch24: cups-maxlogsize.patch
 Patch28: cups-no-propagate-ipp-port.patch
 Patch32: cups-pid.patch
@@ -62,7 +63,7 @@ Prereq: /usr/sbin/alternatives
 Obsoletes: lpd lpr LPRng <= 3.8.15-3
 Provides: lpd lpr LPRng = 3.8.15-3
 
-BuildPrereq: pam-devel openssl-devel pkgconfig
+BuildPrereq: pam-devel pkgconfig
 BuildPrereq: gnutls-devel
 BuildRequires: openldap-devel
 BuildRequires: make >= 1:3.80
@@ -78,7 +79,6 @@ Requires: dbus >= 0.60
 Summary: Common Unix Printing System - development environment
 Group: Development/Libraries
 Requires: %{name}-libs = %{epoch}:%{version}
-Requires: openssl-devel
 
 %package libs
 Summary: Common Unix Printing System - libraries
@@ -139,6 +139,7 @@ lpd emulation.
 %patch20 -p1 -b .direct-usb
 %patch21 -p1 -b .pstops
 %patch22 -p1 -b .dest-cache-v2
+%patch23 -p1 -b .str1532
 %patch24 -p1 -b .maxlogsize
 %patch28 -p1 -b .no-propagate-ipp-port
 %patch32 -p1 -b .pid
@@ -155,11 +156,7 @@ perl -pi -e "s,\@LIBDIR\@,%{_libdir},g" cups-lpd.real
 perl -pi -e "s,^.SILENT:,," Makedefs.in
 
 %build
-if pkg-config openssl ; then
-  export CFLAGS=`pkg-config --cflags openssl`
-  export CPPFLAGS=`pkg-config --cflags-only-I openssl`
-  export LDFLAGS=`pkg-config --libs-only-L openssl`
-fi
+export CFLAGS="-DLDAP_DEPRECATED=1"
 %configure --with-docdir=%{_docdir}/cups-%{version} \
 	--with-optim="$RPM_OPT_FLAGS $CFLAGS -fstack-protector-all"
 
@@ -388,6 +385,11 @@ rm -rf $RPM_BUILD_ROOT
 %{cups_serverbin}/daemon/cups-lpd
 
 %changelog
+* Fri Apr  7 2006 Tim Waugh <twaugh@redhat.com>
+- No longer need openssl-devel.
+- Build with LDAP_DEPRECATED=1, to pick up declarations of ldap_init() etc.
+- Only warn about ACLs once (STR #1532).
+
 * Thu Apr  6 2006 Tim Waugh <twaugh@redhat.com> 1:1.2-0.2.rc1.7
 - Build requires openldap-devel.
 - Sync pstops.c with svn 5372.