[scribus] fix build with cups 1.5 (#716107)

[Dan Horák]

commit 4526d53e0b1559269d3309531e00f3540588aa55
Author: Dan Horák <dan at danny.cz>
Date:   Fri Jun 24 11:31:46 2011 +0200

    fix build with cups 1.5 (#716107)

 scribus-1.3.9-cups.patch |   24 ++++++++++++++++++++++++
 scribus.spec             |    9 ++++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/scribus-1.3.9-cups.patch b/scribus-1.3.9-cups.patch
new file mode 100644
index 0000000..295c6f4
--- /dev/null
+++ b/scribus-1.3.9-cups.patch
@@ -0,0 +1,24 @@
+diff --git a/Scribus/scribus/cupsoptions.cpp b/Scribus/scribus/cupsoptions.cpp
+index 134bead..34edc06 100644
+--- a/Scribus/scribus/cupsoptions.cpp
++++ b/Scribus/scribus/cupsoptions.cpp
+@@ -42,6 +42,7 @@ for which a new license (GPL+exception) is in place.
+ #include "scconfig.h"
+ #ifdef HAVE_CUPS
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #endif
+ #include "util_icon.h"
+ 
+diff --git a/Scribus/scribus/util_printer.cpp b/Scribus/scribus/util_printer.cpp
+index 8d08cba..1b173cd 100644
+--- a/Scribus/scribus/util_printer.cpp
++++ b/Scribus/scribus/util_printer.cpp
+@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
+ 
+ #if defined( HAVE_CUPS )
+  #include <cups/cups.h>
++ #include <cups/ppd.h>
+ #elif defined(_WIN32)
+  #include <windows.h>
+  #include <winspool.h>
diff --git a/scribus.spec b/scribus.spec
index 0a21b7f..3eeff24 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -1,6 +1,6 @@
 Name:           scribus
 Version:        1.3.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:        DeskTop Publishing application written in Qt
 
@@ -13,6 +13,9 @@ Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
 Patch0:         %{name}-1.3.9-system-hyphen.patch
 # fix rpath injection
 Patch1:         %{name}-1.3.9-rpath.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=716107 (FTBFS)
+# update for cups 1.5
+Patch2:         %{name}-1.3.9-cups.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake
@@ -85,6 +88,7 @@ Obsoletes:      %{name}-doc < 1.3.5-0.12.beta
 %setup -q -n %{name}-%{version}
 %patch0 -p2 -b .system-hyphen
 %patch1 -p2 -b .rpath
+%patch2 -p2 -b .cups
 
 # recode man page to UTF-8
 pushd scribus/manpages
@@ -184,6 +188,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Fri Jun 24 2011 Dan Horák <dan at danny.cz> - 1.3.9-6
+- fix build with cups 1.5 (#716107)
+
 * Wed May 04 2011 Dan Horák <dan at danny.cz> - 1.3.9-5
 - rebuilt against podofo 0.9.1