[packages/cups-filters] - updated to 1.0.42 (but without foomatic-rip for now) - updated dbus patch

[qboosh]

commit cbe62ebde6ecebf9974861991dfee57b9a1a7941
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Dec 1 16:04:03 2013 +0100

    - updated to 1.0.42 (but without foomatic-rip for now)
    - updated dbus patch

 cups-filters-dbus.patch | 15 ++++++++++-----
 cups-filters.spec       | 12 ++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/cups-filters.spec b/cups-filters.spec
index 4355197..90599da 100644
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -7,8 +7,8 @@
 Summary:	OpenPrinting CUPS filters and backends
 Summary(pl.UTF-8):	Filtry i backendy CUPS-a z projektu OpenPrinting
 Name:		cups-filters
-Version:	1.0.41
-Release:	8
+Version:	1.0.42
+Release:	1
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
 #                   imagetopdf, pstopdf, texttopdf
@@ -21,7 +21,7 @@ Release:	8
 License:	GPL v2, GPL v2+, GPL v3, GPL v3+, LGPL v2+, MIT
 Group:		Applications/Printing
 Source0:	http://www.openprinting.org/download/cups-filters/%{name}-%{version}.tar.xz
-# Source0-md5:	fe5a9a07b9a64b35975154068cbedef9
+# Source0-md5:	3047524b51f2ac064663f1997c7d2c81
 Patch0:		%{name}-cups15.patch
 Patch1:		%{name}-pdf-landscape.patch
 Patch2:		%{name}-dbus.patch
@@ -279,6 +279,8 @@ EOF
 	DESTDIR=$RPM_BUILD_ROOT
 %endif
 
+install -p utils/cups-browsed.service $RPM_BUILD_ROOT%{systemdunitdir}
+
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
 # dlopened module
@@ -288,7 +290,9 @@ EOF
 # Not sure what is this good for.
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/ttfread
 
-install -p utils/cups-browsed.service $RPM_BUILD_ROOT%{systemdunitdir}
+# currently in foomatic-filters; to be packaged here after new stable foomatic-filters release
+%{__rm} $RPM_BUILD_ROOT%{_cups_serverbin}/filter/foomatic-rip \
+	$RPM_BUILD_ROOT%{_mandir}/man1/foomatic-rip.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
diff --git a/cups-filters-dbus.patch b/cups-filters-dbus.patch
index 626d3e8..e273507 100644
--- a/cups-filters-dbus.patch
+++ b/cups-filters-dbus.patch
@@ -44,15 +44,20 @@ diff -up cups-filters-1.0.41/configure.ac.dbus cups-filters-1.0.41/configure.ac
  	avahi:           ${enable_avahi}
  	browsing:        ${with_browseremoteprotocols}
  	werror:          ${enable_werror}
-diff -up cups-filters-1.0.41/filter/colord.c.dbus cups-filters-1.0.41/filter/colord.c
---- cups-filters-1.0.41/filter/colord.c.dbus	2013-07-29 20:12:42.000000000 +0100
-+++ cups-filters-1.0.41/filter/colord.c	2013-11-06 17:16:58.505234623 +0000
-@@ -32,6 +32,8 @@ MIT Open Source License  -  http://www.o
+--- cups-filters-1.0.42/cupsfilters/colord.c.orig	2013-11-27 00:40:41.000000000 +0100
++++ cups-filters-1.0.42/cupsfilters/colord.c	2013-12-01 14:33:00.854197621 +0100
+@@ -32,12 +32,12 @@ MIT Open Source License  -  http://www.o
  #include <stdio.h>
  #include <sys/types.h>
  
-+#include "config.h"
++#include "colord.h"
 +
  #ifdef HAVE_DBUS
    #include <dbus/dbus.h>
  #endif
+ 
+-#include "colord.h"
+-
+ #define QUAL_COLORSPACE   0
+ #define QUAL_MEDIA        1
+ #define QUAL_RESOLUTION   2
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cups-filters.git/commitdiff/cbe62ebde6ecebf9974861991dfee57b9a1a7941