This commit is contained in:
Jiri Popelka 2014-07-28 10:48:10 +02:00
parent 1ba8d97201
commit 1a4b0c9511
5 changed files with 7 additions and 38 deletions

1
.gitignore vendored
View File

@ -30,3 +30,4 @@
/cups-filters-1.0.52.tar.xz
/cups-filters-1.0.53.tar.xz
/cups-filters-1.0.54.tar.xz
/cups-filters-1.0.55.tar.xz

View File

@ -1,12 +0,0 @@
diff -up cups-filters-1.0.53/filter/pstopdf.execmem cups-filters-1.0.53/filter/pstopdf
--- cups-filters-1.0.53/filter/pstopdf.execmem 2014-06-06 13:48:30.005230247 +0100
+++ cups-filters-1.0.53/filter/pstopdf 2014-06-06 13:49:05.762403657 +0100
@@ -105,7 +105,7 @@ eval "$(printf "%s" "$5" | sed -nre 's/.
eval "$(printf "%s" "$5" | sed -nre 's/.*(^|\s)orientation-requested=4.*/orientation="${orientation:-90}"/p')"
eval "$(printf "%s" "$5" | sed -nre 's/.*(^|\s)orientation-requested=5.*/orientation="${orientation:-270}"/p')"
eval "$(printf "%s" "$5" | sed -nre 's/.*(^|\s)orientation-requested=6.*/orientation="${orientation:-180}"/p')"
-if printf "%s" "$5" | grep -iPq '(\s|^)landscape(=(1|on|yes|true))?(\s|$)'; then
+if printf "%s" "$5" | grep -qiE '(\s|^)landscape(=(1|on|yes|true))?(\s|$)'; then
if test -e "$PPD"; then
eval "$(sed -nre 's/^\*LandscapeOrientation:\s*Plus90.*/orientation="${orientation:-90}"/p' "$PPD")"
eval "$(sed -nre 's/^\*LandscapeOrientation:\s*Minus90.*/orientation="${orientation:-270}"/p' "$PPD")"

View File

@ -1,14 +0,0 @@
diff -up cups-filters-1.0.54/Makefile.am.makefile cups-filters-1.0.54/Makefile.am
--- cups-filters-1.0.54/Makefile.am.makefile 2014-06-11 13:36:11.962393900 +0100
+++ cups-filters-1.0.54/Makefile.am 2014-06-11 13:40:34.343533005 +0100
@@ -467,7 +467,9 @@ bannertopdf_LDADD = \
$(FONTCONFIG_LIBS) \
libfontembed.la
-bannertopdf_DEPENDENCIES = $(GETLINE)
+bannertopdf_DEPENDENCIES = \
+ $(GETLINE) \
+ libfontembed.la
commandtoescpx_SOURCES = \
cupsfilters/driver.h \

View File

@ -3,8 +3,8 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.0.54
Release: 4%{?dist}
Version: 1.0.55
Release: 1%{?dist}
# For a breakdown of the licensing, see COPYING file
# GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*,
@ -20,9 +20,6 @@ License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT
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-makefile.patch
Patch2: cups-filters-execmem.patch
Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
# Obsolete cups-php (bug #971741)
@ -117,12 +114,6 @@ This is the development package for OpenPrinting CUPS filters and backends.
%prep
%setup -q
# 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
@ -251,6 +242,9 @@ fi
%{_libdir}/libfontembed.so
%changelog
* Mon Jul 28 2014 Jiri Popelka <jpopelka@redhat.com> - 1.0.55-1
- 1.0.55
* Fri Jun 13 2014 Tim Waugh <twaugh@redhat.com> - 1.0.54-4
- Really fix execmem issue (bug #1079534).

View File

@ -1 +1 @@
181ee0e6c27cfbb05e241f0267363678 cups-filters-1.0.54.tar.xz
088615a412f23a6237259179a6ab9f10 cups-filters-1.0.55.tar.xz