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

[Tim Waugh]

commit 8aa4ed9abdd79f43eefff7ca9d2728ca2e09469b
Merge: 247716f 382dc70
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Jun 11 14:21:17 2014 +0100

    Merge branch 'f20'

 cups-filters-execmem.patch       |   12 ++++++++++++
 cups-filters-makefile.patch      |   14 ++++++++++++++
 cups-filters-pdf-landscape.patch |   34 ++++++++++++++++++++++++++++++++++
 cups-filters.spec                |   16 +++++++++++++++-
 4 files changed, 75 insertions(+), 1 deletions(-)
---
diff --cc cups-filters.spec
index 448662d,384e750..4d9d26e
--- 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: 4%{?dist}
 +Version: 1.0.54
- Release: 1%{?dist}
++Release: 2%{?dist}
  
  # For a breakdown of the licensing, see COPYING file
  # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@@ -242,17 -244,14 +251,22 @@@ f
  %{_libdir}/libfontembed.so
  
  %changelog
 -* Wed Jun 11 2014 Tim Waugh <twaugh at redhat.com> - 1.0.53-4
++* Wed Jun 11 2014 Tim Waugh <twaugh at redhat.com> - 1.0.54-2
+ - Fix build issue (bug #1106101).
 -
 -* Fri Jun  6 2014 Tim Waugh <twaugh at redhat.com> - 1.0.53-3
+ - 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
 +
 +* 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
  
 -* Fri May 09 2014 Jiri Popelka <jpopelka at redhat.com> - 1.0.53-2
 -- Return Tim's work-around patch for bug #768811.
 +* 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