Accepting request 86885 from home:jsmeix:branches:Printing

cups: upgrade to version 1.5.0 (bnc#722057)

OBS-URL: https://build.opensuse.org/request/show/86885
OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=228

cups-1.4.4-set_default_RIPCache_128m.patch

@@ -1,45 +0,0 @@
---- scheduler/conf.c.orig	2010-09-15 12:37:30.000000000 +0200
-+++ scheduler/conf.c	2010-04-23 20:56:34.000000000 +0200
-@@ -540,7 +540,7 @@ cupsdReadConfiguration(void)
- 
-   cupsdClearString(&DefaultPaperSize);
- 
--  cupsdSetString(&RIPCache, "8m");
-+  cupsdSetString(&RIPCache, "128m");
- 
-   cupsdSetString(&TempDir, NULL);
- 
---- scheduler/cupsfilter.c.orig	2010-03-31 00:07:33.000000000 +0200
-+++ scheduler/cupsfilter.c	2010-09-15 12:39:14.000000000 +0200
-@@ -1218,7 +1218,7 @@ read_cupsd_conf(const char *filename)	/*
-   else
-     set_string(&FontPath, CUPS_FONTPATH);
- 
--  set_string(&RIPCache, "8m");
-+  set_string(&RIPCache, "128m");
- 
-   if ((temp = getenv("CUPS_SERVERBIN")) != NULL)
-     set_string(&ServerBin, temp);
---- doc/help/ref-cupsd-conf.html.in.orig	2010-04-23 20:56:34.000000000 +0200
-+++ doc/help/ref-cupsd-conf.html.in	2010-09-15 12:45:44.000000000 +0200
-@@ -2646,7 +2646,7 @@ appear inside a <A HREF="#Location"><COD
- <H3>Examples</H3>
- 
- <PRE CLASS="command">
--RIPCache 8m
-+RIPCache 128m
- RIPCache 1g
- RIPCache 2048k
- </PRE>
-@@ -2657,8 +2657,9 @@ RIPCache 2048k
- memory cache used by Raster Image Processor ("RIP") filters such
- as <CODE>imagetoraster</CODE> and <CODE>pstoraster</CODE>. The
- size can be suffixed with a "k" for kilobytes, "m" for megabytes,
--or "g" for gigabytes. The default cache size is "8m", or 8
--megabytes.</P>
-+or "g" for gigabytes. The default cache size is "128m", or 128
-+megabytes (compare <A HREF="http://www.cups.org/str.php?L3535">
-+<CODE>CUPS STR 3535</CODE></A>).</P>
- 
- 
- <H2 CLASS="title"><SPAN CLASS="info">CUPS 1.1.16</SPAN><A NAME="RootCertDuration">RootCertDuration</A></H2>

cups-1.4.4-str3461-1.4.reverted.patch

@@ -1,250 +0,0 @@
-diff -rup cups-1.4.4/cups/http.c cups-1.4.4-str3461-1.4.patch.reverted/cups/http.c
---- cups-1.4.4/cups/http.c	2010-06-16 07:27:41.000000000 +0200
-+++ cups-1.4.4-str3461-1.4.patch.reverted/cups/http.c	2010-06-25 11:02:31.000000000 +0200
-@@ -83,12 +83,10 @@
-  *   http_debug_hex()     - Do a hex dump of a buffer.
-  *   http_field()         - Return the field index for a field name.
-  *   http_read_ssl()      - Read from a SSL/TLS connection.
-- *   http_locking_cb()    - Lock/unlock a thread's mutex.
-  *   http_send()          - Send a request with all fields and the trailing
-  *                          blank line.
-  *   http_setup_ssl()     - Set up SSL/TLS support on a connection.
-  *   http_shutdown_ssl()  - Shut down SSL/TLS on a connection.
-- *   http_threadid_cb()   - Return the current thread ID.
-  *   http_upgrade()       - Force upgrade to TLS encryption.
-  *   http_write()         - Write a buffer to a HTTP connection.
-  *   http_write_chunk()   - Write a chunked buffer.
-@@ -146,19 +144,6 @@ static int		http_setup_ssl(http_t *http)
- static void		http_shutdown_ssl(http_t *http);
- static int		http_upgrade(http_t *http);
- static int		http_write_ssl(http_t *http, const char *buf, int len);
--
--#  ifdef HAVE_GNUTLS
--#    ifdef HAVE_PTHREAD_H
--GCRY_THREAD_OPTION_PTHREAD_IMPL;
--#    endif /* HAVE_PTHREAD_H */
--
--#  elif defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
--static pthread_mutex_t	*http_locks;	/* OpenSSL lock mutexes */
--
--static void		http_locking_cb(int mode, int type, const char *file,
--					int line);
--static unsigned long	http_threadid_cb(void);
--#  endif /* HAVE_GNUTLS */
- #endif /* HAVE_SSL */
- 
- 
-@@ -1188,22 +1173,21 @@ httpHead(http_t     *http,		/* I - Conne
- void
- httpInitialize(void)
- {
--  static int	initialized = 0;	/* Have we been called before? */
--#ifdef WIN32
--  WSADATA	winsockdata;		/* WinSock data */
--#endif /* WIN32 */
- #ifdef HAVE_LIBSSL
--  int		i;			/* Looping var */
--  unsigned char	data[1024];		/* Seed data */
-+#  ifndef WIN32
-+  struct timeval        curtime;        /* Current time in microseconds */
-+#  endif /* !WIN32 */
-+  int                   i;              /* Looping var */
-+  unsigned char         data[1024];     /* Seed data */
- #endif /* HAVE_LIBSSL */
- 
--
--  if (initialized)
--    return;
--
- #ifdef WIN32
--  WSAStartup(MAKEWORD(2,2), &winsockdata);
-+  WSADATA       winsockdata;            /* WinSock data */
- 
-+
-+  static int    initialized = 0;        /* Has WinSock been initialized? */
-+  if (!initialized)
-+    WSAStartup(MAKEWORD(1,1), &winsockdata);
- #elif !defined(SO_NOSIGPIPE)
-  /*
-   * Ignore SIGPIPE signals...
-@@ -1226,56 +1210,29 @@ httpInitialize(void)
- #endif /* WIN32 */
- 
- #ifdef HAVE_GNUTLS
-- /*
--  * Make sure we handle threading properly...
--  */
--
--#  ifdef HAVE_PTHREAD_H
--  gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread);
--#  endif /* HAVE_PTHREAD_H */
--
-- /*
--  * Initialize GNU TLS...
--  */
--
-   gnutls_global_init();
-+#endif /* HAVE_GNUTLS */
- 
--#elif defined(HAVE_LIBSSL)
-- /*
--  * Initialize OpenSSL...
--  */
--
-+#ifdef HAVE_LIBSSL
-   SSL_load_error_strings();
-   SSL_library_init();
- 
-  /*
--  * Set the threading callbacks...
--  */
--
--#  ifdef HAVE_PTHREAD_H
--  http_locks = calloc(CRYPTO_num_locks(), sizeof(pthread_mutex_t));
--
--  for (i = 0; i < CRYPTO_num_locks(); i ++)
--    pthread_mutex_init(http_locks + i, NULL);
--
--  CRYPTO_set_id_callback(http_threadid_cb);
--  CRYPTO_set_locking_callback(http_locking_cb);
--#  endif /* HAVE_PTHREAD_H */
--
-- /*
-   * Using the current time is a dubious random seed, but on some systems
-   * it is the best we can do (on others, this seed isn't even used...)
-   */
- 
--  CUPS_SRAND(time(NULL));
-+#  ifdef WIN32
-+#  else
-+  gettimeofday(&curtime, NULL);
-+  srand(curtime.tv_sec + curtime.tv_usec);
-+#  endif /* WIN32 */
- 
-   for (i = 0; i < sizeof(data); i ++)
--    data[i] = CUPS_RAND();
-+    data[i] = rand();
- 
-   RAND_seed(data, sizeof(data));
--#endif /* HAVE_GNUTLS */
--
--  initialized = 1;
-+#endif /* HAVE_LIBSSL */
- }
- 
- 
-@@ -2834,25 +2791,6 @@ http_read_ssl(http_t *http,		/* I - Conn
- #endif /* HAVE_SSL */
- 
- 
--#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
--/*
-- * 'http_locking_cb()' - Lock/unlock a thread's mutex.
-- */
--
--static void
--http_locking_cb(int        mode,	/* I - Lock mode */
--		int        type,	/* I - Lock type */
--		const char *file,	/* I - Source file */
--		int        line)	/* I - Line number */
--{
--  if (mode & CRYPTO_LOCK)
--    pthread_mutex_lock(http_locks + type);
--  else
--    pthread_mutex_unlock(http_locks + type);
--}
--#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
--
--
- /*
-  * 'http_send()' - Send a request with all fields and the trailing blank line.
-  */
-@@ -3224,19 +3162,6 @@ http_shutdown_ssl(http_t *http)		/* I -
- #endif /* HAVE_SSL */
- 
- 
--#if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD_H)
--/*
-- * 'http_threadid_cb()' - Return the current thread ID.
-- */
--
--static unsigned long			/* O - Thread ID */
--http_threadid_cb(void)
--{
--  return ((unsigned long)pthread_self());
--}
--#endif /* HAVE_LIBSSL && HAVE_PTHREAD_H */
--
--
- #ifdef HAVE_SSL
- /*
-  * 'http_upgrade()' - Force upgrade to TLS encryption.
-diff -rup cups-1.4.4/cups/http-private.h cups-1.4.4-str3461-1.4.patch.reverted/cups/http-private.h
---- cups-1.4.4/cups/http-private.h	2010-04-12 06:03:53.000000000 +0200
-+++ cups-1.4.4-str3461-1.4.patch.reverted/cups/http-private.h	2010-06-25 11:03:34.000000000 +0200
-@@ -98,7 +98,6 @@ extern BIO_METHOD *_httpBIOMethods(void)
-  * The GNU TLS library is more of a "bare metal" SSL/TLS library...
-  */
- #    include <gnutls/gnutls.h>
--#    include <gcrypt.h>
- 
- typedef struct
- {
-diff -rup cups-1.4.4/scheduler/main.c cups-1.4.4-str3461-1.4.patch.reverted/scheduler/main.c
---- cups-1.4.4/scheduler/main.c	2010-04-23 20:56:34.000000000 +0200
-+++ cups-1.4.4-str3461-1.4.patch.reverted/scheduler/main.c	2010-06-25 11:14:07.000000000 +0200
-@@ -549,8 +549,6 @@ main(int  argc,				/* I - Number of comm
-   * Startup the server...
-   */
- 
--  httpInitialize();
--
-   cupsdStartServer();
- 
-  /*
-diff -rup cups-1.4.4/scheduler/server.c cups-1.4.4-str3461-1.4.patch.reverted/scheduler/server.c
---- cups-1.4.4/scheduler/server.c	2010-04-12 06:03:53.000000000 +0200
-+++ cups-1.4.4-str3461-1.4.patch.reverted/scheduler/server.c	2010-06-25 11:12:52.000000000 +0200
-@@ -44,6 +44,42 @@ static int	started = 0;
- void
- cupsdStartServer(void)
- {
-+#ifdef HAVE_LIBSSL
-+  int                   i;              /* Looping var */
-+  struct timeval        curtime;        /* Current time in microseconds */
-+  unsigned char         data[1024];     /* Seed data */
-+#endif /* HAVE_LIBSSL */
-+
-+
-+#ifdef HAVE_LIBSSL
-+ /*
-+  * Initialize the encryption libraries...
-+  */
-+
-+  SSL_library_init();
-+  SSL_load_error_strings();
-+
-+ /*
-+  * Using the current time is a dubious random seed, but on some systems
-+  * it is the best we can do (on others, this seed isn't even used...)
-+  */
-+
-+  gettimeofday(&curtime, NULL);
-+  srand(curtime.tv_sec + curtime.tv_usec);
-+
-+  for (i = 0; i < sizeof(data); i ++)
-+    data[i] = rand(); /* Yes, this is a poor source of random data... */
-+
-+  RAND_seed(&data, sizeof(data));
-+#elif defined(HAVE_GNUTLS)
-+ /*
-+  * Initialize the encryption libraries...
-+  */
-+
-+  gnutls_global_init();
-+#endif /* HAVE_LIBSSL */
-+
-+       
-  /*
-   * Create the default security profile...
-   */

cups-1.4.8-source.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bd27e1213c139ed0bbadc5c29f97cf1e8f7f8f5b0bb29b227ecaff32aafa9a6
-size 4547162

cups-1.5-additional_policies.patch

@@ -1,11 +1,11 @@
---- conf/cupsd.conf.in.orig	2010-11-12 09:04:07.000000000 +0100
+--- conf/cupsd.conf.in.orig	2010-12-09 22:24:51.000000000 +0100
-+++ conf/cupsd.conf.in	2010-11-12 09:16:14.000000000 +0100
++++ conf/cupsd.conf.in	2011-10-05 13:51:39.000000000 +0200
-@@ -124,3 +124,25 @@ DefaultAuthType Basic
+@@ -138,3 +138,25 @@ WebInterface @CUPS_WEBIF@
  #
- # End of "$Id: cupsd.conf.in 9310 2010-09-21 22:34:57Z mike $".
+ # End of "$Id: cupsd.conf.in 9407 2010-12-09 21:24:51Z mike $".
  #
 +
-+# The policy below is added by openSUSE/Novell during build of our cups package.
++# The policy below is added by SUSE during build of our cups package.
 +# The policy 'allowallforanybody' is totally open and insecure and therefore
 +# it can only be used within an internal network where only trused users exist
 +# and where the cupsd is not accessible at all from any external host, see
@@ -15,7 +15,7 @@
 +# print jobs from an internal network to any external destination, see
 +# http://en.opensuse.org/SDB:CUPS_in_a_Nutshell
 +# For documentation regarding 'Managing Operation Policies' see
-+# http://www.cups.org/documentation.php/doc-1.4/policies.html
++# http://www.cups.org/documentation.php/doc-1.5/policies.html
 +<Policy allowallforanybody>
 +  <Limit All>
 +    Order deny,allow
@@ -24,5 +24,5 @@
 +</Policy>
 +# Explicitly set the CUPS 'default' policy to be used by default:
 +DefaultPolicy default
-+# End of additions by openSUSE/Novell.
++# End of additions by SUSE.
 +

cups-1.5.0-source.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c6f99b68a558f4d626e9a5076d664f38e9925715dc541b07f0328c9aeb02ec33
+size 4090210

cups.changes

@@ -1,3 +1,57 @@
+-------------------------------------------------------------------
+Thu Oct  6 11:00:09 CEST 2011 - jsmeix@suse.de
+
+- Upgraded to CUPS 1.5.0 (openSUSE Bugzilla bnc#722057)
+  Backward incompatible changes:
+  * The main header cups/cups.h no longer includes the PPD header
+    cups/ppd.h which may require code changes to applications.
+  * CUPS no longer supports the old ~/.cupsrc or ~/.lpoptions files
+    from CUPS 1.1.x. The ~/.cups/client.conf and ~/.cups/lpoptions
+    files that were introduced in CUPS 1.2 must now be used.
+  * The scheduler now requires that filters and backends
+    have group write permissions disabled (security).
+  * The HP-GL/2 filter is no longer included (STR #3322).
+  * The SCSI backend is no longer included (STR #3500).
+  Other changes:
+  * Updated the PostScript filter to support IncludeFeature
+    in more circumstances (STR #3417).
+  * The scheduler now sets the process group for child processes
+    and manages the group (STR #2829).
+  * The scheduler now more carefully creates and removes
+    configuration, cache, and state files (STR #3715).
+  * The lpadmin command now allows default option values
+    to be deleted (STR #2959).
+  * Restored support for GNU TLS and OpenSSL with threading
+    enabled (STR #3605, STR #3461).
+    Therefore cups-1.4.4-str3461-1.4.reverted.patch
+    is no longer needed (openSUSE Bugzilla bnc#617026).
+  * Increased the default RIPCache value to 128MB (STR #3535).
+    Therefore cups-1.4.4-set_default_RIPCache_128m.patch
+    is no longer needed (openSUSE Bugzilla bnc#628233).
+  * Updated PDF filter to support Ghostscript ps2write (STR #3766).
+  * Updated PDF filter to support Poppler option to preserve page
+    sizes in PDF files when the user has not selected a particular
+    media size (STR #3689).
+  * Added new PWG Raster filter for IPP Everywhere printer support.
+  * Added support for a new cupsFilter2 keyword in PPD files
+    to allow for the propagation of the actual MIME media type
+    produced by a filter.
+  * Name resolution errors no longer no longer cause
+    queues to stop (STR #3719, STR #3753). See also
+    https://bugzilla.novell.com/show_bug.cgi?id=337794#c16
+  * Added a new cups-exec helper program that applies security
+    profiles to filters, port monitors, backends, CGI programs,
+    and mini-daemons.
+  * The web interface can now be disabled using the WebInterface
+    directive in cupsd.conf (STR #2625).
+  * The ipptest tool is now a first-class user program (STR #3484).
+  For a complete list see the CHANGES.txt file.
+- cups-1.4.4-str3461-1.4.reverted.patch (bnc#617026) and
+  cups-1.4.4-set_default_RIPCache_128m.patch (bnc#628233)
+  are no longer needed because the issues are fixed upstream.
+  cups-1.5-additional_policies.patch (fate#303515) replaces the
+  cups-1.4-additional_policies.patch which does no longer apply.
+
 -------------------------------------------------------------------
 Fri Sep 30 20:07:52 UTC 2011 - coolo@suse.com
 

cups.spec

@@ -16,12 +16,13 @@
 #
 
 
-
 Name:           cups
 BuildRequires:  avahi-compat-mDNSResponder-devel dbus-1-devel gcc-c++
 BuildRequires:  krb5-devel libpng-devel libtiff-devel openldap2-devel
 BuildRequires:  openslp-devel openssl-devel pam-devel pkg-config tcpd-devel
 BuildRequires:  fdupes update-desktop-files
+# Have libtool as explicit buildrequirement to no longer depend
+# on a "hidden" buildrequirement in the OBS project definition:
 BuildRequires:  libtool
 PreReq:         textutils, fileutils, sh-utils, /usr/sbin/groupadd
 PreReq:         %insserv_prereq
@@ -35,10 +36,10 @@ License:        GPLv2+ ; LGPLv2.1+
 Group:          Hardware/Printing
 Summary:        The Common UNIX Printing System
 # Source0...Source9 is for sources from upstream:
-# URL for Source0: http://ftp.easysw.com/pub/cups/1.4.8/cups-1.4.8-source.tar.bz2
+# URL for Source0: http://ftp.easysw.com/pub/cups/1.5.0/cups-1.5.0-source.tar.bz2
-# MD5 sum for Source0 on http://www.cups.org/software.php 0ec52d3f3c69bc2ab5ed70c594edbce6
+# MD5 sum for Source0 on http://www.cups.org/software.php e54ed09ede2340fc3014913333520fe4
-Version:        1.4.8
+Version:        1.5.0
-Release:        2
+Release:        1
 Source0:        cups-%{version}-source.tar.bz2
 # Require the exact matching version-release of the cups-libs sub-package because
 # non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
@@ -105,23 +106,16 @@ Patch102:       cups-1.3.9-desktop_file.patch
 Patch103:       cups-1.4-do_not_strip_recommended_from_PPDs.patch
 # Patch104 adds the 'allowallforanybody' policy to cupsd.conf
 # see https://fate.novell.com/303515
-Patch104:       cups-1.4-additional_policies.patch
+Patch104:       cups-1.5-additional_policies.patch
-# Patch105 reverts changes by CUPS STR #3461 as band-aid workaround
-# to avoid https://bugzilla.novell.com/show_bug.cgi?id=617026 for now:
-Patch105:       cups-1.4.4-str3461-1.4.reverted.patch
-# Patch106 enlarges the CUPS upstream default RIPCache from 8m to 128m
-# to avoid various kind of printout failures
-# see https://bugzilla.novell.com/show_bug.cgi?id=628233
-Patch106:       cups-1.4.4-set_default_RIPCache_128m.patch
 # Install into this non-root directory (required when norootforbuild is used):
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-The Common UNIX Printing System provides a portable printing layer for
+The Common UNIX Printing System (CUPS) is the
-UNIX operating systems like BSD lp or lprng. CUPS provides some
+standards-based, open source printing system.
-additional features.
+
+See http://www.cups.org
 
-http://www.cups.org
 
 %package libs
 License:        GPLv2+ ; LGPLv2.1+
@@ -133,15 +127,20 @@ Obsoletes:      cups-libs-64bit
 %endif
 
 %description libs
-The Common UNIX Printing System provides a portable printing layer for
+The Common UNIX Printing System (CUPS) is the
-UNIX operating systems like BSD lp or lprng. CUPS provides some
+standards-based, open source printing system.
-additional features. This package contains libraries needed by CUPS and
+
-some other packages.
+See http://www.cups.org
+
+This package contains libraries needed by CUPS
+and other packages.
+
 
 %package client
 License:        GPLv2+
 Summary:        CUPS Client Programs
 Group:          Hardware/Printing
+# Conflicts with other print spoolers which provide same binaries like /usr/bin/lp and so on:
 Conflicts:      plp lprold lprng
 # Require the exact matching version-release of the cups-libs sub-package because
 # non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
@@ -155,10 +154,14 @@ Conflicts:      plp lprold lprng
 Requires:       cups-libs = %{version}-%{release}
 
 %description client
-The Common UNIX Printing System provides a portable printing layer for
+The Common UNIX Printing System (CUPS) is the
-UNIX operating systems like BSD lp or lprng. CUPS provides some
+standards-based, open source printing system.
-additional features. This package contains all programs needed for
+
-running a CUPS client, not a server.
+See http://www.cups.org
+
+This package contains all programs needed
+for running a CUPS client, not a server.
+
 
 %package devel
 License:        GPLv2+
@@ -177,11 +180,13 @@ Obsoletes:      cups-devel-64bit
 %endif
 
 %description devel
-The Common UNIX Printing System provides a portable printing layer for
+The Common UNIX Printing System (CUPS) is the
-UNIX operating systems like BSD lp or lprng. CUPS provides some
+standards-based, open source printing system.
-additional features. This is the development package.
+
+See http://www.cups.org
+
+This is the development package.
 
-http://www.cups.org
 
 %package ddk
 License:        GPLv2+
@@ -196,17 +201,16 @@ Provides:       cupsddk = %{version}
 Obsoletes:      cupsddk < %{version}
 
 %description ddk
-The CUPS Driver Development Kit (DDK) provides a suite of standard
+The Common UNIX Printing System (CUPS) is the
-drivers, a PPD file compiler, and other utilities that can be used to
+standards-based, open source printing system.
-develop printer drivers for CUPS and other printing environments.  CUPS
+
-provides a portable printing layer for UNIX(r)-based operating systems.
+See http://www.cups.org
-The CUPS DDK provides the means for mass-producing PPD files and
+
-drivers or filters for CUPS-based printer drivers.
+The CUPS Driver Development Kit (DDK) provides
-The Common UNIX Printing System provides a portable printing layer for
+a suite of standard drivers, a PPD file compiler,
-UNIX operating systems like BSD lp or lprng. CUPS provides some
+and other utilities that can be used to develop
-additional features. This is the Driver Development Kit package.
+printer drivers for CUPS.
 
-http://www.cups.org
 
 %prep
 # Be quiet when unpacking:
@@ -231,11 +235,6 @@ http://www.cups.org
 %patch103
 # Patch104 adds the 'allowallforanybody' policy to cupsd.conf:
 %patch104
-# Patch105 reverts changes by CUPS STR #3461 as band-aid workaround
-# to avoid https://bugzilla.novell.com/show_bug.cgi?id=617026 for now:
-%patch105 -p1
-# Patch106 enlarges the CUPS upstream default RIPCache from 8m to 128m:
-%patch106
 
 %build
 # Disable SILENT run of make so that make runs verbose as usual:
@@ -297,8 +296,6 @@ ln -sf /usr/share/ghostscript/fonts $RPM_BUILD_ROOT/usr/share/cups/
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/cups/ssl
 # Add a client.conf as template (Source108: cups-client.conf):
 install -m644 %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/cups/client.conf
-# Add D-BUS Configuration:
-install -m 644 -D packaging/cups-dbus.conf $RPM_BUILD_ROOT%{_sysconfdir}/dbus-1/system.d/cups.conf
 # Source104: cups.xinetd
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d
 install -m 644 -D %{SOURCE104} $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/cups-lpd
@@ -378,6 +375,7 @@ exit 0
 # exit successfully in any case:
 exit 0
 
+%files
 # The files sections list all mandatory files explicitely one by one.
 # In particular all executables are listed explicitely.
 # This avoids that CUPS' configure magic might silently
@@ -393,8 +391,6 @@ exit 0
 # the build fails intentionally if a mandatory file was not built
 # which ensures that already existing correctly built binary RPMs
 # are not overwritten by broken RPMs where mandatory files are missing.
-
-%files
 %defattr(-,root,root)
 %config(noreplace) %attr(640,root,lp) %{_sysconfdir}/cups/cupsd.conf
 %{_sysconfdir}/cups/cupsd.conf.default
@@ -416,10 +412,11 @@ exit 0
 %dir /usr/lib/cups
 %dir /usr/lib/cups/backend
 /usr/lib/cups/backend/http
+/usr/lib/cups/backend/https
 /usr/lib/cups/backend/ipp
+/usr/lib/cups/backend/ipps
 /usr/lib/cups/backend/lpd
 /usr/lib/cups/backend/parallel
-/usr/lib/cups/backend/scsi
 /usr/lib/cups/backend/serial
 /usr/lib/cups/backend/snmp
 /usr/lib/cups/backend/socket
@@ -433,6 +430,7 @@ exit 0
 %dir /usr/lib/cups/daemon
 /usr/lib/cups/daemon/cups-deviced
 /usr/lib/cups/daemon/cups-driverd
+/usr/lib/cups/daemon/cups-exec
 /usr/lib/cups/daemon/cups-lpd
 /usr/lib/cups/daemon/cups-polld
 %dir /usr/lib/cups/driver
@@ -442,7 +440,6 @@ exit 0
 /usr/lib/cups/filter/commandtopclx
 /usr/lib/cups/filter/commandtops
 /usr/lib/cups/filter/gziptoany
-/usr/lib/cups/filter/hpgltops
 /usr/lib/cups/filter/imagetops
 /usr/lib/cups/filter/imagetoraster
 /usr/lib/cups/filter/pdftops
@@ -453,6 +450,7 @@ exit 0
 /usr/lib/cups/filter/rastertohp
 /usr/lib/cups/filter/rastertolabel
 /usr/lib/cups/filter/rastertopclx
+/usr/lib/cups/filter/rastertopwg
 /usr/lib/cups/filter/texttops
 %dir /usr/lib/cups/monitor
 /usr/lib/cups/monitor/bcp
@@ -489,6 +487,7 @@ exit 0
 %{_datadir}/cups/
 %exclude %{_datadir}/cups/ppdc/
 
+%files client
 # Set explicite owner, group, and permissions for lppasswd
 # to enforce to have the upstream owner, group, and permissions in the RPM
 # because otherwise our build magic /usr/sbin/Check sets them to lp:lp 2755
@@ -497,11 +496,10 @@ exit 0
 # and subsequent comments up to comment #17 therein.
 # Even if /etc/permissions.secure in the openSUSE:Factory build system might be
 # already fixed, it must also work for build systems for released products.
-
-%files client
 %defattr(-,root,root)
 %{_bindir}/cancel
 %{_bindir}/cupstestdsc
+%{_bindir}/ipptool
 %{_bindir}/lp
 %{_bindir}/lpoptions
 %attr(0555,root,root) %{_bindir}/lppasswd
@@ -521,6 +519,7 @@ exit 0
 %{_sbindir}/reject
 %doc %{_mandir}/man1/cancel.1.gz
 %doc %{_mandir}/man1/cupstestdsc.1.gz
+%doc %{_mandir}/man1/ipptool.1.gz
 %doc %{_mandir}/man1/lp.1.gz
 %doc %{_mandir}/man1/lpoptions.1.gz
 %doc %{_mandir}/man1/lppasswd.1.gz
@@ -528,6 +527,7 @@ exit 0
 %doc %{_mandir}/man1/lpr.1.gz
 %doc %{_mandir}/man1/lprm.1.gz
 %doc %{_mandir}/man1/lpstat.1.gz
+%doc %{_mandir}/man5/ipptoolfile.5.gz
 %doc %{_mandir}/man8/accept.8.gz
 %doc %{_mandir}/man8/cupsaccept.8.gz
 %doc %{_mandir}/man8/cupsdisable.8.gz