From 5fa6217951597051d885f177fa0f69ef8e35ba62 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 18 Jan 2011 11:54:21 +0000
Subject: [PATCH 1/2] Don't use --enable-pie configure option as it has been
 removed and is now assumed.

---
 cups.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cups.spec b/cups.spec
index fe43086..162fce8 100644
--- a/cups.spec
+++ b/cups.spec
@@ -8,7 +8,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.4.6
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -307,7 +307,7 @@ export CFLAGS="$RPM_OPT_FLAGS -fstack-protector-all -DLDAP_DEPRECATED=1"
 %if %lspp
 	--enable-lspp \
 %endif
-	--with-log-file-perm=0600 --enable-pie --enable-relro \
+	--with-log-file-perm=0600 --enable-relro \
 	--with-pdftops=pdftops \
 	--with-dbusdir=%{_sysconfdir}/dbus-1 \
 	--with-php=/usr/bin/php-cgi --enable-avahi \
@@ -576,6 +576,10 @@ rm -rf $RPM_BUILD_ROOT
 %{php_extdir}/phpcups.so
 
 %changelog
+* Tue Jan 18 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-3
+- Don't use --enable-pie configure option as it has been removed and
+  is now assumed.
+
 * Mon Jan 10 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-2
 - Use a smaller buffer when writing to USB devices (bug #617208).
 - Handle EAI_NONAME when resolving hostnames (bug #617208).

From 4816e653e4a48588a1ec5ddef944a5c53bd90c33 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Tue, 18 Jan 2011 12:48:16 +0000
Subject: [PATCH 2/2] Don't use --enable-pie configure option as it has been
 removed and is now assumed.  See STR #3691.

---
 cups.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cups.spec b/cups.spec
index 162fce8..a520d3b 100644
--- a/cups.spec
+++ b/cups.spec
@@ -578,7 +578,7 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue Jan 18 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-3
 - Don't use --enable-pie configure option as it has been removed and
-  is now assumed.
+  is now assumed.  See STR #3691.
 
 * Mon Jan 10 2011 Tim Waugh <twaugh@redhat.com> 1:1.4.6-2
 - Use a smaller buffer when writing to USB devices (bug #617208).