From 523b1be22fcebb6624a4dab6bde7e4aedc9734cd Mon Sep 17 00:00:00 2001 From: Zdenek Dohnal Date: Tue, 4 Oct 2016 19:03:57 +0200 Subject: [PATCH] fixing typo in cups-cpu-hammering.patch --- cups-cpu-hammering.patch | 7 +++---- cups.spec | 5 ++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cups-cpu-hammering.patch b/cups-cpu-hammering.patch index a23d296..8938f13 100644 --- a/cups-cpu-hammering.patch +++ b/cups-cpu-hammering.patch @@ -1,7 +1,6 @@ -diff -up cups-2.2.0/CHANGES.txt.cpu-hammering cups-2.2.0/CHANGES.txt diff -up cups-2.2.0/cups/http-addrlist.c.cpu-hammering cups-2.2.0/cups/http-addrlist.c ---- cups-2.2.0/cups/http-addrlist.c.cpu-hammering 2016-09-19 19:56:54.074866957 +0200 -+++ cups-2.2.0/cups/http-addrlist.c 2016-09-21 11:45:22.264775409 +0200 +--- cups-2.2.0/cups/http-addrlist.c.cpu-hammering 2016-10-04 18:54:55.697172885 +0200 ++++ cups-2.2.0/cups/http-addrlist.c 2016-10-04 18:56:41.038252500 +0200 @@ -304,6 +304,8 @@ httpAddrConnect2( if (result > 0) @@ -28,7 +27,7 @@ diff -up cups-2.2.0/cups/http-addrlist.c.cpu-hammering cups-2.2.0/cups/http-addr +# ifdef HAVE_POLL + else if (pfds[i].revents & (POLLERR | POLLHUP)) +# else -+ else if (FD_SET(fds[i], &error)) ++ else if (FD_ISSET(fds[i], &error)) +# endif /* HAVE_POLL */ + { + /* diff --git a/cups.spec b/cups.spec index 57ee425..dc8c36c 100644 --- a/cups.spec +++ b/cups.spec @@ -15,7 +15,7 @@ Summary: CUPS printing system Name: cups Epoch: 1 Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Url: http://www.cups.org/ Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz @@ -620,6 +620,9 @@ rm -f %{cups_serverbin}/backend/smb %{_mandir}/man5/ipptoolfile.5.gz %changelog +* Tue Oct 04 2016 Zdenek Dohnal - 1:2.2.0-3 +- fixing typo in cups-cpu-hammering.patch + * Thu Sep 22 2016 Zdenek Dohnal - 1:2.2.0-2 - fixing looping in partial failing service (bug #1366775)