Merge branch 'f13' into f14

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.  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).
 - Handle EAI_NONAME when resolving hostnames (bug #617208).