[cups-filters] 1.0.42: includes foomatic-rip (obsoletes foomatic-filters package)

[Jiří Popelka]

commit 167d5a24a2c5f5b8ce0d4ff01c44b3345cddde59
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Sat Nov 30 19:46:42 2013 +0100

    1.0.42: includes foomatic-rip (obsoletes foomatic-filters package)

 .gitignore                      |    1 +
 cups-filters-dbus.patch         |   58 ---------------------------------------
 cups-filters-filter-costs.patch |   12 --------
 cups-filters-memory-leaks.patch |   36 ------------------------
 cups-filters.spec               |   27 +++++++-----------
 sources                         |    2 +-
 6 files changed, 13 insertions(+), 123 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 84c9cb1..56161f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /cups-filters-1.0.39.tar.xz
 /cups-filters-1.0.40.tar.xz
 /cups-filters-1.0.41.tar.xz
+/cups-filters-1.0.42.tar.xz
diff --git a/cups-filters.spec b/cups-filters.spec
index a52e90d..a9ff4d1 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -3,14 +3,14 @@
 
 Summary: OpenPrinting CUPS filters and backends
 Name:    cups-filters
-Version: 1.0.41
-Release: 4%{?dist}
+Version: 1.0.42
+Release: 1%{?dist}
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
 #                   imagetopdf, pstopdf, texttopdf
 #         backends: parallel, serial
-# GPLv2+:  filters: gstopxl, textonly, texttops, imagetops
+# GPLv2+:  filters: gstopxl, textonly, texttops, imagetops, foomatic-rip
 # GPLv3:   filters: bannertopdf
 # GPLv3+:  filters: urftopdf
 # LGPLv2+:   utils: cups-browsed
@@ -22,9 +22,6 @@ Url:     http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups
 Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
 
 Patch1: cups-filters-pdf-landscape.patch
-Patch2: cups-filters-dbus.patch
-Patch3: cups-filters-memory-leaks.patch
-Patch4: cups-filters-filter-costs.patch
 
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
 
@@ -79,6 +76,10 @@ Requires(postun): systemd
 Provides: ghostscript-cups = 9.08
 Obsoletes: ghostscript-cups < 9.08
 
+# foomatic-rip's upstream moved from foomatic-filters to cups-filters-1.0.42
+Provides: foomatic-filters = 4.0.9-8
+Obsoletes: foomatic-filters < 4.0.9-8
+
 %package libs
 Summary: OpenPrinting CUPS filters and backends - cupsfilters and fontembed libraries
 Group:   System Environment/Libraries
@@ -111,16 +112,6 @@ This is the development package for OpenPrinting CUPS filters and backends.
 # Fix PDF landscape printing (bug #768811).
 %patch1 -p1 -b .pdf-landscape
 
-# Include dbus so that colord support works (bug #1026928).
-%patch2 -p1 -b .dbus
-
-# Fix memory leaks in cups-browsed (bug #1027317).
-%patch3 -p1 -b .memory-leaks
-
-# Adjust filter costs so application/vnd.adobe-read-postscript input
-# doesn't go via pstotiff (bug #1008166).
-%patch4 -p1 -b .filter-costs
-
 %build
 # work-around Rpath
 ./autogen.sh
@@ -219,6 +210,7 @@ fi
 %{_unitdir}/cups-browsed.service
 %{_mandir}/man8/cups-browsed.8.gz
 %{_mandir}/man5/cups-browsed.conf.5.gz
+%{_mandir}/man1/foomatic-rip.1.gz
 
 %files libs
 %doc __doc/COPYING fontembed/README
@@ -235,6 +227,9 @@ fi
 %{_libdir}/libfontembed.so
 
 %changelog
+* Sat Nov 30 2013 Jiri Popelka <jpopelka at redhat.com> - 1.0.42-1
+- 1.0.42: includes foomatic-rip (obsoletes foomatic-filters package)
+
 * Tue Nov 19 2013 Tim Waugh <twaugh at redhat.com> - 1.0.41-4
 - Adjust filter costs so application/vnd.adobe-read-postscript input
   doesn't go via pstotiff (bug #1008166).
diff --git a/sources b/sources
index 3340f74..be78c1d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe5a9a07b9a64b35975154068cbedef9  cups-filters-1.0.41.tar.xz
+3047524b51f2ac064663f1997c7d2c81  cups-filters-1.0.42.tar.xz