Merge branch 'f20'

cups-filters.spec

@@ -4,7 +4,7 @@
 Summary: OpenPrinting CUPS filters and backends
 Name:    cups-filters
 Version: 1.0.54
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -21,6 +21,7 @@ Url:     http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups
 Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
 
 Patch1: cups-filters-makefile.patch
+Patch2: cups-filters-execmem.patch
 
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
 
@@ -119,6 +120,9 @@ This is the development package for OpenPrinting CUPS filters and backends.
 # Fixed build issue (bug #1106101).
 %patch1 -p1 -b .cups-filters
 
+# Don't use grep's -P switch in pstopdf as it needs execmem (bug #1079534).
+%patch2 -p1 -b .execmem
+
 %build
 # work-around Rpath
 ./autogen.sh
@@ -247,6 +251,9 @@ fi
 %{_libdir}/libfontembed.so
 
 %changelog
+* Fri Jun 13 2014 Tim Waugh <twaugh@redhat.com> - 1.0.54-4
+- Really fix execmem issue (bug #1079534).
+
 * Wed Jun 11 2014 Jiri Popelka <jpopelka@redhat.com> - 1.0.54-3
 - Remove (F21) pdf-landscape.patch