From 8a184c73a9769a34e5ca4c70aaa15b172e01fb4d Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Tue, 30 Aug 2016 14:23:57 +0200
Subject: [PATCH] rebase to 1.11.2, adding cupsfilters-poppler.convs and
 cupsfilters-mupdf.convs into package

---
 .gitignore                     |  1 +
 cups-filters-missing-ppd.patch | 33 ---------------------------------
 cups-filters.spec              | 11 +++++++----
 sources                        |  2 +-
 4 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 cups-filters-missing-ppd.patch

diff --git a/.gitignore b/.gitignore
index 2801549..f4216ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@
 /cups-filters-1.8.3.tar.xz
 /cups-filters-1.9.0.tar.xz
 /cups-filters-1.10.0.tar.xz
+/cups-filters-1.11.2.tar.xz
diff --git a/cups-filters-missing-ppd.patch b/cups-filters-missing-ppd.patch
deleted file mode 100644
index a05ff35..0000000
--- a/cups-filters-missing-ppd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up cups-filters-1.10.0/cupsfilters/colord.h.missing-ppd cups-filters-1.10.0/cupsfilters/colord.h
---- cups-filters-1.10.0/cupsfilters/colord.h.missing-ppd	2015-06-26 17:45:26.000000000 +0200
-+++ cups-filters-1.10.0/cupsfilters/colord.h	2016-07-18 18:36:03.020800454 +0200
-@@ -35,6 +35,7 @@ extern "C" {
- /* Common routines for accessing the colord CMS framework */
- 
- #include <cups/raster.h>
-+#include <cups/ppd.h>
- 
- char  **colord_get_qualifier_for_ppd      (ppd_file_t *ppd);
- char   *colord_get_profile_for_device_id  (const char *device_id,
-diff -up cups-filters-1.10.0/cupsfilters/colormanager.h.missing-ppd cups-filters-1.10.0/cupsfilters/colormanager.h
---- cups-filters-1.10.0/cupsfilters/colormanager.h.missing-ppd	2016-07-18 18:42:26.891818338 +0200
-+++ cups-filters-1.10.0/cupsfilters/colormanager.h	2016-07-18 18:42:51.559626705 +0200
-@@ -38,6 +38,7 @@ extern "C" {
- 
- 
- #include <cups/raster.h>
-+#include <cups/ppd.h>
- 
- 
- 
-diff -up cups-filters-1.10.0/cupsfilters/driver.h.missing-ppd cups-filters-1.10.0/cupsfilters/driver.h
---- cups-filters-1.10.0/cupsfilters/driver.h.missing-ppd	2016-01-19 23:12:43.000000000 +0100
-+++ cups-filters-1.10.0/cupsfilters/driver.h	2016-07-18 18:36:03.033800353 +0200
-@@ -25,6 +25,7 @@ extern "C" {
- #  include <stdlib.h>
- #  include <time.h>
- #  include <math.h>
-+#  include <cups/ppd.h>
- 
- #  if defined(WIN32) || defined(__EMX__)
- #    include <io.h>
diff --git a/cups-filters.spec b/cups-filters.spec
index c286b53..b902e36 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -3,8 +3,8 @@
 
 Summary: OpenPrinting CUPS filters and backends
 Name:    cups-filters
-Version: 1.10.0
-Release: 3%{?dist}
+Version: 1.11.2
+Release: 1%{?dist}
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -19,7 +19,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-missing-ppd.patch
 
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
 
@@ -114,7 +113,6 @@ This is the development package for OpenPrinting CUPS filters and backends.
 
 %prep
 %setup -q
-%patch1 -p1 -b .missing-ppd
 
 %build
 # work-around Rpath
@@ -239,6 +237,8 @@ fi
 %{_datadir}/cups/mime/cupsfilters.types
 %{_datadir}/cups/mime/cupsfilters.convs
 %{_datadir}/cups/mime/cupsfilters-ghostscript.convs
+%{_datadir}/cups/mime/cupsfilters-mupdf.convs
+%{_datadir}/cups/mime/cupsfilters-poppler.convs
 %{_datadir}/cups/mime/braille.convs
 %{_datadir}/cups/mime/braille.types
 %{_datadir}/ppd/cupsfilters
@@ -266,6 +266,9 @@ fi
 %{_libdir}/libfontembed.so
 
 %changelog
+* Tue Aug 30 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1.11.2-1
+- rebase to 1.11.2, adding cupsfilters-poppler.convs and cupsfilters-mupdf.convs into package
+
 * Wed Aug 03 2016 Jiri Popelka <jpopelka@redhat.com> - 1.10.0-3
 - %%{_defaultdocdir}/cups-filters/ -> %%{_pkgdocdir}
 
diff --git a/sources b/sources
index 3857e9e..df0defa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d84c6cb3df637a9655e46dfae41dce50  cups-filters-1.10.0.tar.xz
+019d2161df59da33d93b294d934bc14b  cups-filters-1.11.2.tar.xz