From 80940e86406ccde643eb57daf0460f7aec35798e79726266d58c350576e3b010 Mon Sep 17 00:00:00 2001 From: Johannes Meixner Date: Thu, 27 Sep 2012 07:45:29 +0000 Subject: [PATCH] Accepting request 136162 from home:m_meister:branches:Printing - Version upgrade to 1.5.4 (mainly a bugfix release) that fixes some IPP printing issues. Excerpt: * The IPP backend no longer tries to get the job status for printers that do not implement the required operation (STR #4083). * Sending a document in an unsupported format to an IPP printer now automatically cancels the job (STR #4093). * The IPP backend now treats the client-error-not-possible status code as a job history issue, allowing IPP printing to Windows to work(STR #4047). For a complete list see the CHANGES.txt file. - revert_cups-ssl.m4_to_1.5.2.patch is now obsolete because of an upstream fix. Apple grant an openssl linking exception (and an exception for linking on Apple owned operating systems). OBS-URL: https://build.opensuse.org/request/show/136162 OBS-URL: https://build.opensuse.org/package/show/Printing/cups?expand=0&rev=246 --- cups-1.5.3-source.tar.bz2 | 3 -- cups-1.5.4-source.tar.bz2 | 3 ++ cups.changes | 22 +++++++++++++-- cups.spec | 25 +++-------------- revert_cups-ssl.m4_to_1.5.2.patch | 46 ------------------------------- 5 files changed, 27 insertions(+), 72 deletions(-) delete mode 100644 cups-1.5.3-source.tar.bz2 create mode 100644 cups-1.5.4-source.tar.bz2 delete mode 100644 revert_cups-ssl.m4_to_1.5.2.patch diff --git a/cups-1.5.3-source.tar.bz2 b/cups-1.5.3-source.tar.bz2 deleted file mode 100644 index 3e92dd1..0000000 --- a/cups-1.5.3-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9d716a8ffcefdaff1c37f4a4b590f1d74ff9ff72383a18f3c883c9235907f93d -size 9580485 diff --git a/cups-1.5.4-source.tar.bz2 b/cups-1.5.4-source.tar.bz2 new file mode 100644 index 0000000..b67d3b8 --- /dev/null +++ b/cups-1.5.4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8023034e8b58eab1ad7279364e872270a77459f6fb59a84d03229cb1d2a6d0e5 +size 9583002 diff --git a/cups.changes b/cups.changes index ed94414..e2ea035 100644 --- a/cups.changes +++ b/cups.changes @@ -1,9 +1,27 @@ +------------------------------------------------------------------- +Thu Sep 27 07:27:01 UTC 2012 - mmeister@suse.com + +- Version upgrade to 1.5.4 (mainly a bugfix release) that fixes + some IPP printing issues. + Excerpt: + * The IPP backend no longer tries to get the job status for + printers that do not implement the required operation + (STR #4083). + * Sending a document in an unsupported format to an IPP printer + now automatically cancels the job (STR #4093). + * The IPP backend now treats the client-error-not-possible + status code as a job history issue, allowing IPP printing to + Windows to work(STR #4047). + For a complete list see the CHANGES.txt file. +- revert_cups-ssl.m4_to_1.5.2.patch is now obsolete because of + an upstream fix. + ------------------------------------------------------------------- Tue Sep 4 14:55:57 UTC 2012 - cfarrell@suse.com - license update: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.1 - Apple grant an openssl linking exception (and an exception for linking on - Apple owned operating systems) + Apple grant an openssl linking exception (and an exception for + linking on Apple owned operating systems). ------------------------------------------------------------------- Wed Aug 1 11:32:13 CEST 2012 - jsmeix@suse.de diff --git a/cups.spec b/cups.spec index 9f2defb..7e7558c 100644 --- a/cups.spec +++ b/cups.spec @@ -56,9 +56,9 @@ Summary: The Common UNIX Printing System License: SUSE-GPL-2.0-with-openssl-exception and LGPL-2.1 Group: Hardware/Printing # Source0...Source9 is for sources from upstream: -# URL for Source0: http://ftp.easysw.com/pub/cups/1.5.3/cups-1.5.3-source.tar.bz2 -# MD5 sum for Source0 on http://www.cups.org/software.php e1ad15257aa6f162414ea3beae0c5df8 -Version: 1.5.3 +# URL for Source0: http://ftp.easysw.com/pub/cups/1.5.4/cups-1.5.4-source.tar.bz2 +# MD5 sum for Source0 on http://www.cups.org/software.php de3006e5cf1ee78a9c6145ce62c4e982 +Version: 1.5.4 Release: 0 Source0: cups-%{version}-source.tar.bz2 # Require the exact matching version-release of the cups-libs sub-package because @@ -70,8 +70,8 @@ Source0: cups-%{version}-source.tar.bz2 # on the same package repository where the cups package is because # all are built simulaneously from the same cups source package # and all required packages are provided on the same repository: -Requires: cups-libs = %{version}-%{release} Requires: cups-client = %{version} +Requires: cups-libs = %{version}-%{release} # Inherited RPM Requires from the past but I (jsmeix@suse.de) do not know the reason for it: Requires: util-linux # The Ghostscript device "cups" is needed by several CUPS filters @@ -137,12 +137,6 @@ Patch104: cups-1.5-additional_policies.patch Patch105: cups-0001-systemd-add-systemd-socket-activation-and-unit-files.patch # Patch106 fixes option --libs in cups-config script: Patch106: cups-config-libs.patch -# Patch107 revert_cups-ssl.m4_to_1.5.2.patch reverts config-scripts/cups-ssl.m4 -# to what it was in CUPS 1.5.2 so that autoconf (at least with autoconf version 2.63) -# produces a syntactically correct configure script otherwise "bash -n configure" fails -# with "configure: line : syntax error: unexpected end of file", -# see http://www.cups.org/str.php?L4084 -Patch107: revert_cups-ssl.m4_to_1.5.2.patch # Install into this non-root directory (required when norootforbuild is used): BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -279,17 +273,6 @@ printer drivers for CUPS. %patch105 # Patch106 fixes option --libs in cups-config script: %patch106 -# Patch107 revert_cups-ssl.m4_to_1.5.2.patch reverts config-scripts/cups-ssl.m4 -# to what it was in CUPS 1.5.2 so that autoconf (at least with autoconf version 2.63) -# produces a syntactically correct configure script otherwise "bash -n configure" fails -# with "configure: line : syntax error: unexpected end of file", -# see http://www.cups.org/str.php?L4084 -# It fails with autoconf-2.63 that we use on SUSE Linux Enterprise 11 products -# but it works with autoconf-2.68 that we use on openSUSE 11.4, 12.1, and "Factory" -# so that Patch107 is only needed if suse_version < 1140: -%if 0%{?suse_version} < 1140 -%patch107 -p1 -%endif %build # Disable SILENT run of make so that make runs verbose as usual: diff --git a/revert_cups-ssl.m4_to_1.5.2.patch b/revert_cups-ssl.m4_to_1.5.2.patch deleted file mode 100644 index 19ffc8c..0000000 --- a/revert_cups-ssl.m4_to_1.5.2.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- cups-1.5.3/config-scripts/cups-ssl.m4 2012-03-21 05:45:48.000000000 +0100 -+++ cups-1.5.2/config-scripts/cups-ssl.m4 2011-06-16 22:12:16.000000000 +0200 -@@ -1,9 +1,9 @@ - dnl --dnl "$Id: cups-ssl.m4 10371 2012-03-21 04:45:48Z mike $" -+dnl "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $" - dnl - dnl OpenSSL/GNUTLS stuff for CUPS. - dnl --dnl Copyright 2007-2012 by Apple Inc. -+dnl Copyright 2007-2011 by Apple Inc. - dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. - dnl - dnl These coded instructions, statements, and computer programs are the -@@ -136,9 +136,9 @@ if test x$enable_ssl != xno; then - dnl case the RSAREF libraries are needed. - - for libcrypto in \ -- "-lcrypto" \ -- "-lcrypto -lrsaref" \ -- "-lcrypto -lRSAglue -lrsaref" -+ "-lcrypto" \ -+ "-lcrypto -lrsaref" \ -+ "-lcrypto -lRSAglue -lrsaref" - do - AC_CHECK_LIB(ssl,SSL_new, - [have_ssl=1 -@@ -149,9 +149,6 @@ if test x$enable_ssl != xno; then - $libcrypto) - - if test "x${SSLLIBS}" != "x"; then -- LIBS="$SAVELIBS $SSLLIBS" -- AC_CHECK_FUNC(SSL_set_tlsext_host_name, -- AC_DEFINE(HAVE_SSL_SET_TLSEXT_HOST_NAME)) - break - fi - done -@@ -176,6 +173,7 @@ AC_SUBST(SSLLIBS) - EXPORT_SSLLIBS="$SSLLIBS" - AC_SUBST(EXPORT_SSLLIBS) - -+ - dnl --dnl End of "$Id: cups-ssl.m4 10371 2012-03-21 04:45:48Z mike $". -+dnl End of "$Id: cups-ssl.m4 9837 2011-06-16 20:12:16Z mike $". - dnl