From d0c40659688d94e1ba93f1cb84cac1c6e8597dc9 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Jul 22 2020 06:21:05 +0000
Subject: Revert "- Do not link nut_scanner against libcommon."


This reverts commit 24127d18ecaf0729fc177122cbfb903376141486.

---

diff --git a/nut-link.patch b/nut-link.patch
deleted file mode 100644
index a26f6a5..0000000
--- a/nut-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nrup a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am
---- a/tools/nut-scanner/Makefile.am	2015-12-29 05:08:34.000000000 -0700
-+++ b/tools/nut-scanner/Makefile.am	2020-01-07 15:26:14.134932956 -0700
-@@ -21,7 +21,7 @@ libnutscan_la_CFLAGS = -I$(top_srcdir)/c
- 
- nut_scanner_SOURCES = nut-scanner.c
- nut_scanner_CFLAGS = -I$(top_srcdir)/clients -I$(top_srcdir)/include
--nut_scanner_LDADD = libnutscan.la ../../common/libcommon.la
-+nut_scanner_LDADD = libnutscan.la
- 
- if WITH_SSL
-   libnutscan_la_CFLAGS += $(LIBSSL_CFLAGS)
diff --git a/nut.spec b/nut.spec
index dbb1fe7..6cf29f3 100644
--- a/nut.spec
+++ b/nut.spec
@@ -14,7 +14,7 @@
 Summary: Network UPS Tools
 Name: nut
 Version: 2.7.4
-Release: 33%{?dist}
+Release: 32%{?dist}
 License: GPLv2+ and GPLv3+
 Url: http://www.networkupstools.org/
 Source: http://www.networkupstools.org/source/2.7/%{name}-%{version}.tar.gz
@@ -31,7 +31,6 @@ Patch7: nut-2.6.5-foreground.patch
 Patch8: nut-2.6.5-unreachable.patch
 Patch9: nut-2.6.5-rmpidf.patch
 Patch10: nut-2.7.4-cloexec.patch
-Patch11: nut-link.patch
 
 Requires(pre): shadow-utils
 Requires(post): coreutils systemd
@@ -137,7 +136,6 @@ necessary to develop NUT client applications.
 %patch8 -p1 -b .unreachable
 %patch9 -p1 -b .rmpidf
 %patch10 -p1 -b .cloexec
-%patch11 -p1 -b .link
 
 sed -i 's|=NUT-Monitor|=nut-monitor|'  scripts/python/app/nut-monitor.desktop
 sed -i 's|env python|env python3|' scripts/python/app/NUT-Monitor
@@ -446,9 +444,6 @@ fi
 %{_libdir}/pkgconfig/libnutscan.pc
 
 %changelog
-* Tue Jul 21 2020 Jeff Law <law@redhat.com> - 2.7.4-33
-- Do not link nut_scanner against libcommon.
-
 * Tue Jun 02 2020 Michal Hlavinka <mhlavink@redhat.com> - 2.7.4-32
 - nut user needs tty group for wall (#1774591)