This commit is contained in:
Jaromír Končický 2013-08-29 11:35:12 +02:00
parent 1eb9c826de
commit 79fa2c0fa8
5 changed files with 8 additions and 91 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@
/cups-filters-1.0.34.tar.xz
/cups-filters-1.0.35.tar.xz
/cups-filters-1.0.36.tar.xz
/cups-filters-1.0.37.tar.xz

View File

@ -1,10 +0,0 @@
[Unit]
Description=Make remote CUPS printers available locally
After=cups.service avahi-daemon.service
Wants=cups.service avahi-daemon.service
[Service]
ExecStart=/usr/sbin/cups-browsed
[Install]
WantedBy=multi-user.target

View File

@ -1,71 +0,0 @@
diff -up cups-filters-1.0.36/mime/cupsfilters.convs.filter-costs cups-filters-1.0.36/mime/cupsfilters.convs
--- cups-filters-1.0.36/mime/cupsfilters.convs.filter-costs 2013-07-29 20:45:51.000000000 +0100
+++ cups-filters-1.0.36/mime/cupsfilters.convs 2013-08-21 11:24:23.708994885 +0100
@@ -42,32 +42,32 @@
# if it comes from an encrypted PDF file, we simply override pstopdf and the
# PDF workflow.
-application/postscript application/pdf 100 pstopdf
+application/postscript application/pdf 0 pstopdf
application/vnd.adobe-reader-postscript application/vnd.cups-postscript 66 pstops
application/pdf application/vnd.cups-pdf 66 pdftopdf
-application/x-cshell application/pdf 0 texttopdf
-application/x-csource application/pdf 0 texttopdf
-application/x-perl application/pdf 0 texttopdf
-application/x-shell application/pdf 0 texttopdf
-text/plain application/pdf 0 texttopdf
-text/html application/pdf 0 texttopdf
-image/gif application/vnd.cups-pdf 33 imagetopdf
-image/png application/vnd.cups-pdf 33 imagetopdf
-image/jpeg application/vnd.cups-pdf 33 imagetopdf
-image/tiff application/vnd.cups-pdf 33 imagetopdf
-image/x-bitmap application/vnd.cups-pdf 33 imagetopdf
-image/x-photocd application/vnd.cups-pdf 33 imagetopdf
-image/x-portable-anymap application/vnd.cups-pdf 33 imagetopdf
-image/x-portable-bitmap application/vnd.cups-pdf 33 imagetopdf
-image/x-portable-graymap application/vnd.cups-pdf 33 imagetopdf
-image/x-portable-pixmap application/vnd.cups-pdf 33 imagetopdf
-image/x-sgi-rgb application/vnd.cups-pdf 33 imagetopdf
-image/x-xbitmap application/vnd.cups-pdf 33 imagetopdf
-image/x-xpixmap application/vnd.cups-pdf 33 imagetopdf
-image/x-xwindowdump application/vnd.cups-pdf 33 imagetopdf
-image/x-sun-raster application/vnd.cups-pdf 33 imagetopdf
-application/vnd.cups-pdf-banner application/pdf 33 bannertopdf
+application/x-cshell application/pdf 32 texttopdf
+application/x-csource application/pdf 32 texttopdf
+application/x-perl application/pdf 32 texttopdf
+application/x-shell application/pdf 32 texttopdf
+text/plain application/pdf 32 texttopdf
+text/html application/pdf 32 texttopdf
+image/gif application/vnd.cups-pdf 65 imagetopdf
+image/png application/vnd.cups-pdf 65 imagetopdf
+image/jpeg application/vnd.cups-pdf 65 imagetopdf
+image/tiff application/vnd.cups-pdf 65 imagetopdf
+image/x-bitmap application/vnd.cups-pdf 65 imagetopdf
+image/x-photocd application/vnd.cups-pdf 65 imagetopdf
+image/x-portable-anymap application/vnd.cups-pdf 65 imagetopdf
+image/x-portable-bitmap application/vnd.cups-pdf 65 imagetopdf
+image/x-portable-graymap application/vnd.cups-pdf 65 imagetopdf
+image/x-portable-pixmap application/vnd.cups-pdf 65 imagetopdf
+image/x-sgi-rgb application/vnd.cups-pdf 65 imagetopdf
+image/x-xbitmap application/vnd.cups-pdf 65 imagetopdf
+image/x-xpixmap application/vnd.cups-pdf 65 imagetopdf
+image/x-xwindowdump application/vnd.cups-pdf 65 imagetopdf
+image/x-sun-raster application/vnd.cups-pdf 65 imagetopdf
+application/vnd.cups-pdf-banner application/pdf 32 bannertopdf
image/urf application/pdf 0 urftopdf
########################################################################
@@ -84,8 +84,8 @@ application/vnd.cups-pdf application/vnd
# Raster filters...
#
-application/vnd.cups-pdf application/vnd.cups-raster 66 gstoraster
-application/vnd.cups-postscript application/vnd.cups-raster 100 gstoraster
+application/vnd.cups-pdf application/vnd.cups-raster 99 gstoraster
+application/vnd.cups-postscript application/vnd.cups-raster 200 gstoraster
application/vnd.cups-pdf application/vnd.cups-raster 100 pdftoraster
image/gif application/vnd.cups-raster 100 imagetoraster
image/png application/vnd.cups-raster 100 imagetoraster
diff -up cups-filters-1.0.36/NEWS.filter-costs cups-filters-1.0.36/NEWS

View File

@ -3,8 +3,8 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.0.36
Release: 2%{?dist}
Version: 1.0.37
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
Group: System Environment/Base
Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
Source1: cups-browsed.service
Patch1: cups-filters-filter-costs.patch
Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
@ -98,9 +95,6 @@ This is the development package for OpenPrinting CUPS filters and backends.
%prep
%setup -q
# Upstream patch to re-work filter costs (bug #998977).
%patch1 -p1 -b .filter-costs
%build
# work-around Rpath
./autogen.sh
@ -135,7 +129,7 @@ rm -f %{buildroot}%{_bindir}/ttfread
# systemd unit file
mkdir -p %{buildroot}%{_unitdir}
install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
install -p -m 644 utils/cups-browsed.service %{buildroot}%{_unitdir}
%post
%systemd_post cups-browsed.service
@ -214,6 +208,9 @@ fi
%{_libdir}/libfontembed.so
%changelog
* Thu Aug 29 2013 Jaromír Končický <jkoncick@redhat.com> - 1.0.37-1
- 1.0.37.
* Wed Aug 21 2013 Tim Waugh <twaugh@redhat.com> - 1.0.36-2
- Upstream patch to re-work filter costs (bug #998977). No longer need
text filter costs patch as paps gets used by default now if

View File

@ -1 +1 @@
595c41a7e16136fc8c0fed1d35f583f6 cups-filters-1.0.36.tar.xz
210e5cb70e9474b91dd2ab4291a5e48e cups-filters-1.0.37.tar.xz