up to 1.28.8

- dbus patch appears to be obsolete
- rediff and renumber patches

diff --git a/cups-filters-dbus.patch b/cups-filters-dbus.patch
deleted file mode 100644 (file)
index 9283d9a..0000000
--- a/cups-filters-dbus.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -up cups-filters-1.0.41/Makefile.am.dbus cups-filters-1.0.41/Makefile.am
---- cups-filters-1.0.41/Makefile.am.dbus       2013-10-25 14:12:56.000000000 +0100
-+++ cups-filters-1.0.41/Makefile.am    2013-11-06 17:16:58.504234619 +0000
-@@ -474,9 +474,11 @@ gstoraster_SOURCES = \
- gstoraster_CFLAGS = \
-       $(CUPS_CFLAGS) \
-       $(LIBQPDF_CFLAGS) \
-+      $(DBUS_CFLAGS) \
-       -I$(srcdir)/cupsfilters/
- gstoraster_LDADD = \
-       $(CUPS_LIBS) \
-       $(LIBQPDF_LIBS) \
-+      $(DBUS_LIBS) \
-       libcupsfilters.la
- 
- imagetopdf_SOURCES = \
-diff -up cups-filters-1.0.41/config.h.in.dbus cups-filters-1.0.41/config.h.in
-diff -up cups-filters-1.0.41/configure.ac.dbus cups-filters-1.0.41/configure.ac
---- cups-filters-1.0.41/configure.ac.dbus      2013-10-30 07:21:44.000000000 +0000
-+++ cups-filters-1.0.41/configure.ac   2013-11-06 17:23:07.619921079 +0000
-@@ -114,6 +114,18 @@ AX_COMPARE_VERSION([$CUPS_VERSION],[gt],
- AC_DEFINE(PDFTOPDF, [], [Needed for pdftopdf filter compilation])
- AC_DEFINE_DIR(BANNERTOPDF_DATADIR, "{CUPS_DATADIR}/data", [Directory where bannertopdf finds its data files (PDF templates)])
- 
-+dnl DBus support
-+DBUS_CFLAGS=""
-+DBUS_LIBS=""
-+AC_ARG_ENABLE([dbus], AC_HELP_STRING([--disable-dbus],
-+    [Do not use dbus to communicate with external services]))
-+if test "$enable_dbus" != "no"; then
-+        PKG_CHECK_MODULES(DBUS, [dbus-1], [HAVE_DBUS=-DHAVE_DBUS])
-+        AC_DEFINE([HAVE_DBUS], [], [Defines if dbus is available.])
-+fi
-+AC_SUBST(DBUS_CFLAGS)
-+AC_SUBST(DBUS_LIBS)
-+
- AC_SEARCH_LIBS([dlopen],
-       [dl],
-       [AS_IF([test "$ac_cv_search_dlopen" != "none required"], [
-@@ -640,6 +652,7 @@ Build configuration:
-       php-config:      ${with_php_config}
-       test-font:       ${with_test_font_path}
-       tiff:            ${with_tiff}
-+      dbus:            ${HAVE_DBUS}
-       avahi:           ${enable_avahi}
-       browsing:        ${with_browseremoteprotocols}
-       werror:          ${enable_werror}
---- 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 "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

diff --git a/cups-filters-php.patch b/cups-filters-php.patch
index 57e694718f881f3d0eaabea6e0669a9dcde191d8..122d4e5d276406bc1a55feb498a1b670fac832b5 100644 (file)
--- a/cups-filters-php.patch
+++ b/cups-filters-php.patch
@@ -11,7 +11,7 @@
  # =========
 --- cups-filters-1.0.41/Makefile.am.orig       2013-12-01 10:26:49.831484169 +0100
 +++ cups-filters-1.0.41/Makefile.am    2013-12-01 10:37:08.568124870 +0100
-@@ -696,7 +696,7 @@
+@@ -696,8 +696,8 @@
        scripting/php/phpcups.c \
        scripting/php/phpcups.h
  libphpcups_la_LIBADD = $(CUPS_LIBS)
@@ -20,7 +20,8 @@
 +libphpcups_la_CFLAGS = $(CUPS_CFLAGS) $(PHP_CFLAGS)
 +libphpcups_la_LDFLAGS = -module -avoid-version -shared -no-undefined
  
- 
+ EXTRA_DIST += \
+       scripting/perl \
 --- cups-filters-1.0.41/scripting/php/phpcups.c.orig   2012-06-22 18:10:47.000000000 +0200
 +++ cups-filters-1.0.41/scripting/php/phpcups.c        2013-12-01 10:50:16.171425151 +0100
 @@ -29,12 +29,16 @@

diff --git a/cups-filters.spec b/cups-filters.spec
index 0b78dc7b76f3539cf97ad61f2ea543a7cdabc8cf..41ec21eaed1d134f4c3776aabb3e791eeb698019 100644 (file)
--- a/cups-filters.spec
+++ b/cups-filters.spec
@@ -11,7 +11,7 @@
 Summary:       OpenPrinting CUPS filters and backends
 Summary(pl.UTF-8):     Filtry i backendy CUPS-a z projektu OpenPrinting
 Name:          cups-filters
-Version:       1.28.7
+Version:       1.28.8
 Release:       1
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
@@ -25,11 +25,10 @@ Release:    1
 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: 2efeed97e11ea5e157c5f4f2e0780fe7
-Patch0:                %{name}-dbus.patch
-Patch1:                %{name}-php.patch
-Patch2:                %{name}-php7.patch
-Patch3:                %{name}-php73.patch
+# Source0-md5: 914fb53d31ff8500dc25d2e2c68ca5c1
+Patch0:                %{name}-php.patch
+Patch1:                %{name}-php7.patch
+Patch2:                %{name}-php73.patch
 URL:           http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
@@ -248,7 +247,6 @@ Moduł PHP do ogólnego systemu druku dla Uniksa.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__aclocal}