From fb0beccc59cc7b1aaedc820091827fd18950f4d4 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Thu, 11 Jun 2020 09:01:49 +0200
Subject: [PATCH] fix patch errors in failover patch

---
 cups-failover-backend.patch | 77 ++++++++++++++++++-------------------
 cups.spec                   |  5 ++-
 2 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/cups-failover-backend.patch b/cups-failover-backend.patch
index a92dad8..1bcf627 100644
--- a/cups-failover-backend.patch
+++ b/cups-failover-backend.patch
@@ -1,42 +1,6 @@
-diff --git a/backend/Makefile b/backend/Makefile
-index 3038682..6642016 100644
---- a/backend/Makefile
-+++ b/backend/Makefile
-@@ -28,6 +28,7 @@ include ../Makedefs
- RBACKENDS =	\
- 		ipp \
- 		lpd \
-+		failover \
- 		$(DNSSD_BACKEND)
- UBACKENDS =	\
- 		snmp \
-@@ -51,6 +52,7 @@ LIBOBJS	=	\
- OBJS	=	\
- 		ipp.o \
- 		lpd.o \
-+		failover.o \
- 		dnssd.o \
- 		snmp.o \
- 		socket.o \
-@@ -275,6 +277,13 @@ lpd:	lpd.o ../cups/$(LIBCUPS) libbackend.a
- 	echo Linking $@...
- 	$(LD_CC) $(LDFLAGS) -o lpd lpd.o libbackend.a $(LIBS)
- 
-+#
-+# failover
-+#
-+
-+failover:	failover.o ../cups/$(LIBCUPS) libbackend.a
-+	echo Linking $@...
-+	$(LD_CC) $(LDFLAGS) -o failover failover.o libbackend.a $(LIBS)
- 
- #
- # snmp
-diff --git a/backend/failover.c b/backend/failover.c
-new file mode 100644
-index 0000000..9affd8f
---- /dev/null
-+++ b/backend/failover.c
+diff -up cups-2.3.3/backend/failover.c.failover cups-2.3.3/backend/failover.c
+--- cups-2.3.3/backend/failover.c.failover	2020-06-11 08:49:20.515264358 +0200
++++ cups-2.3.3/backend/failover.c	2020-06-11 08:49:20.515264358 +0200
 @@ -0,0 +1,837 @@
 +/*
 + * Failover Backend for the Common UNIX Printing System (CUPS).
@@ -875,3 +839,38 @@ index 0000000..9affd8f
 +  else
 +    return (NULL);
 +}
+diff -up cups-2.3.3/backend/Makefile.failover cups-2.3.3/backend/Makefile
+--- cups-2.3.3/backend/Makefile.failover	2020-04-27 20:04:29.000000000 +0200
++++ cups-2.3.3/backend/Makefile	2020-06-11 08:52:31.212642019 +0200
+@@ -22,6 +22,7 @@ include ../Makedefs
+ RBACKENDS =	\
+ 		ipp \
+ 		lpd \
++		failover \
+ 		$(DNSSD_BACKEND)
+ UBACKENDS =	\
+ 		snmp \
+@@ -45,6 +46,7 @@ LIBOBJS	=	\
+ OBJS	=	\
+ 		ipp.o \
+ 		lpd.o \
++		failover.o \
+ 		dnssd.o \
+ 		snmp.o \
+ 		socket.o \
+@@ -276,6 +278,15 @@ lpd:	lpd.o ../cups/$(LIBCUPS) libbackend
+ 
+ 
+ #
++# failover
++#
++
++failover:	failover.o ../cups/$(LIBCUPS) libbackend.a
++	echo Linking $@...
++	$(LD_CC) $(ALL_LDFLAGS) -o failover failover.o libbackend.a $(LINKCUPS)
++
++
++#
+ # snmp
+ #
+ 
diff --git a/cups.spec b/cups.spec
index acc4115..719a18e 100644
--- a/cups.spec
+++ b/cups.spec
@@ -15,7 +15,7 @@ Summary: CUPS printing system
 Name: cups
 Epoch: 1
 Version: 2.3.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: ASL 2.0 with exceptions for GPL2/LGPL2
 Url: http://www.cups.org/
 Source0: https://github.com/apple/cups/releases/download/v%{VERSION}/cups-%{VERSION}-source.tar.gz
@@ -747,6 +747,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man7/ippevepcl.7.gz
 
 %changelog
+* Thu Jun 11 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-6
+- fix patch errors in failover patch
+
 * Tue Jun 02 2020 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.3.3-5
 - remove os ci tests, we use baseos ci