rebase 1.10.0, include missing ppd.h

This commit is contained in:
Zdenek Dohnal 2016-07-18 19:11:13 +02:00
parent 388489a768
commit 5e48cacb68
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,33 @@
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>

View File

@ -3,7 +3,7 @@
Summary: OpenPrinting CUPS filters and backends
Name: cups-filters
Version: 1.9.0
Version: 1.10.0
Release: 1%{?dist}
# For a breakdown of the licensing, see COPYING file
@ -19,6 +19,7 @@ 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}
@ -113,6 +114,7 @@ This is the development package for OpenPrinting CUPS filters and backends.
%prep
%setup -q
%patch1 -p1 -b .missing-ppd
%build
# work-around Rpath
@ -264,6 +266,9 @@ fi
%{_libdir}/libfontembed.so
%changelog
* Mon Jul 18 2016 Zdenek Dohnal <zdohnal@redhat.com> - 1.10.0-1
- rebase 1.10.0, include missing ppd.h
* Fri Jun 10 2016 Jiri Popelka <jpopelka@redhat.com> - 1.9.0-1
- 1.9.0