Merge branch 'f19'

cups.spec

@@ -14,7 +14,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 1.7
-Release: 0.13.%{prever}%{?dist}
+Release: 0.14.%{prever}%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cups.org/
@@ -259,14 +259,6 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
 %patch100 -p1 -b .lspp
 %endif
 
-# We want to use the PDF workflow in principle with one exception when the input
-# is PostScript and the printer is a native PostScript printer.
-# To avoid the PS -> PDF -> PS conversion (costs 66),
-# set the cost factor of pstops to 65.
-# This forth-and-back conversion sometimes produces PostScript files which are
-# too big for the printer's memory resulting in not getting printed.
-sed -i -r -e '/\spstops$/ { s/66/65/ }' conf/mime.convs.in
-
 sed -i -e '1iMaxLogSize 0' conf/cupsd.conf.in
 
 # Let's look at the compilation command lines.
@@ -641,6 +633,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man5/ipptoolfile.5.gz
 
 %changelog
+* Wed Jul 10 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.7-0.14.b1
+- Remove pstops cost factor tweak from conf/mime.convs.in
+
 * Mon Jul  1 2013 Tim Waugh <twaugh@redhat.com> 1:1.7-0.13.b1
 - Don't use D-Bus from two threads (bug #979748).