[cups-filters: 2/2] Merge branch 'f20'

[Tim Waugh]

commit 1ba8d97201b70655afd60b21a673fcb17805d04b
Merge: ad5aa32 7f3ae9d
Author: Tim Waugh <twaugh at redhat.com>
Date:   Fri Jun 13 09:52:50 2014 +0100

    Merge branch 'f20'

 cups-filters.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --cc cups-filters.spec
index f1abffa,ddba6b8..e9700de
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@@ -3,8 -3,8 +3,8 @@@
  
  Summary: OpenPrinting CUPS filters and backends
  Name:    cups-filters
 -Version: 1.0.53
 -Release: 5%{?dist}
 +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*,
@@@ -20,7 -20,9 +20,8 @@@ License: GPLv2 and GPLv2+ and GPLv3 an
  Url:     http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
  Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
  
 -Patch1: cups-filters-pdf-landscape.patch
 -Patch2: cups-filters-makefile.patch
 -Patch3: cups-filters-execmem.patch
 +Patch1: cups-filters-makefile.patch
++Patch2: cups-filters-execmem.patch
  
  Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
  
@@@ -116,9 -114,15 +117,12 @@@ This is the development package for Ope
  %prep
  %setup -q
  
 -# Fix PDF landscape printing (bug #768811).
 -%patch1 -p1 -b .pdf-landscape
 -
  # Fixed build issue (bug #1106101).
 -%patch2 -p1 -b .cups-filters
 +%patch1 -p1 -b .cups-filters
  
+ # Don't use grep's -P switch in pstopdf as it needs execmem (bug #1079534).
 -%patch3 -p1 -b .execmem
++%patch2 -p1 -b .execmem
+ 
  %build
  # work-around Rpath
  ./autogen.sh
@@@ -247,25 -248,17 +251,28 @@@ f
  %{_libdir}/libfontembed.so
  
  %changelog
 -* Fri Jun 13 2014 Tim Waugh <twaugh at redhat.com> - 1.0.53-5
++* Fri Jun 13 2014 Tim Waugh <twaugh at redhat.com> - 1.0.54-4
+ - Really fix execmem issue (bug #1079534).
+ 
 -* Wed Jun 11 2014 Tim Waugh <twaugh at redhat.com> - 1.0.53-4
 -- Fix build issue (bug #1106101).
 +* Wed Jun 11 2014 Jiri Popelka <jpopelka at redhat.com> - 1.0.54-3
 +- Remove (F21) pdf-landscape.patch
  
 -* Fri Jun  6 2014 Tim Waugh <twaugh at redhat.com> - 1.0.53-3
 +* Wed Jun 11 2014 Tim Waugh <twaugh at redhat.com> - 1.0.54-2
 +- Fix build issue (bug #1106101).
  - Don't use grep's -P switch in pstopdf as it needs execmem (bug #1079534).
 +- Return work-around patch for bug #768811.
 +
 +* Mon Jun 09 2014 Jiri Popelka <jpopelka at redhat.com> - 1.0.54-1
 +- 1.0.54
  
 -* Fri May 09 2014 Jiri Popelka <jpopelka at redhat.com> - 1.0.53-2
 -- Return Tim's work-around patch for bug #768811.
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.53-4
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
 +* Tue Jun 03 2014 Jiri Popelka <jpopelka at redhat.com> - 1.0.53-3
 +- Remove BuildRequires pkgconfig(lcms). pkgconfig(lcms2) is enough.
 +
 +* Tue May 13 2014 Marek Kasik <mkasik at redhat.com> - 1.0.53-2
 +- Rebuild (poppler-0.26.0)
  
  * Mon Apr 28 2014 Jiri Popelka <jpopelka at redhat.com> - 1.0.53-1
  - 1.0.53