- rel 1

- fix building against cups 1.5.0

Changed files:
    hplip-cups15.patch -> 1.1
    hplip.spec -> 1.88

diff --git a/hplip-cups15.patch b/hplip-cups15.patch
new file mode 100644 (file)
index 0000000..1cc2aa6
--- /dev/null
+++ b/hplip-cups15.patch
@@ -0,0 +1,10 @@
+--- hplip-3.11.7/prnt/hpps/hppsfilter.c~       2011-07-24 20:58:05.000000000 +0200
++++ hplip-3.11.7/prnt/hpps/hppsfilter.c        2011-07-28 22:05:30.006775432 +0200
+@@ -38,6 +38,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <cups/cups.h>
++#include <cups/ppd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ 

diff --git a/hplip.spec b/hplip.spec
index 33e72df75d977b1d92a247ab534d6f34cab38856..d9294d073f0a8c8fa97b9c12f26cb3a7ac00577f 100644 (file)
--- a/hplip.spec
+++ b/hplip.spec
@@ -11,13 +11,14 @@ Summary:    Hewlett-Packard Linux Imaging and Printing suite - printing and scannin
 Summary(pl.UTF-8):     Narzędzia Hewlett-Packard Linux Imaging and Printing - drukowanie i skanowanie przy użyciu urządzeń HP
 Name:          hplip
 Version:       3.11.7
-Release:       0.1
+Release:       1
 License:       BSD (hpijs), MIT (low-level scanning and printing code), GPL v2 (the rest)
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/hplip/%{name}-%{version}.tar.gz
 # Source0-md5: 5cb89a00b0c680d8bf9bf4b4f1f863b1
 Patch0:                %{name}-desktop.patch
 Patch1:                unresolved.patch
+Patch2:                %{name}-cups15.patch
 URL:           http://hplipopensource.com/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -154,6 +155,7 @@ urządzenia HP AiO.
 %undos Makefile.am
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %{__sed} -i -e's,^#!/usr/bin/env python$,#!/usr/bin/python,' *.py
 %{__sed} -i -e 's#test -d /usr/share/polkit-1#true#' configure.in