From c49cf2653a5659ebf54d4aecda700345789f7057 Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Thu, 8 Apr 2021 14:32:05 +0200
Subject: [PATCH] Fix file conflicts with libnet-devel

Trying to install libnet-devel.x86_64 and libnet-devel.i686 fails with

  file /usr/bin/libnet-config conflicts between attempted installs of libnet-devel-1.2-2.fc34.x86_64 and libnet-devel-1.2-2.fc34.i686

The file libnet-config contains for x86_64 the string 'lib64' and for
i686 'lib' which makes the devel packages not installable at the same
time.

Running 'libnet-config --libs' returns '-L/usr/lib64 -lnet' for x86_64
and without '64' for i686. As that is both the default location for
libraries it can be omitted which this patch does.

With this patch applied 'libnet-config --libs' returns just '-lnet'.

Resolves: rhbz#1915836

Signed-off-by: Adrian Reber <adrian@lisas.de>
---
 libnet-config.patch | 16 ++++++++++++++++
 libnet.spec         |  7 ++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 libnet-config.patch

diff --git a/libnet-config.patch b/libnet-config.patch
new file mode 100644
index 0000000..a8a6bb8
--- /dev/null
+++ b/libnet-config.patch
@@ -0,0 +1,16 @@
+--- libnet-1.2/libnet-config.in.orig	2021-04-08 14:13:20.095564421 +0200
++++ libnet-1.2/libnet-config.in	2021-04-08 14:13:42.038730961 +0200
+@@ -12,12 +12,11 @@
+ 
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
+ includedir=@includedir@
+ 
+ libnet_defines="@PKG_CONFIG_DEFINES@"
+ libnet_cflags="-I${includedir} @PKG_CONFIG_CFLAGS@"
+-libnet_libs="-L${libdir} @PKG_CONFIG_LIBS@ -lnet"
++libnet_libs="@PKG_CONFIG_LIBS@ -lnet"
+ 
+ usage()
+ {
diff --git a/libnet.spec b/libnet.spec
index 339c86a..9f78495 100644
--- a/libnet.spec
+++ b/libnet.spec
@@ -1,10 +1,11 @@
 Summary:        C library for portable packet creation and injection
 Name:           libnet
 Version:        1.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD
 URL:            https://github.com/libnet/libnet
 Source0:        https://github.com/libnet/libnet/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Patch0:         libnet-config.patch
 BuildRequires:  gcc
 BuildRequires:  make
 BuildRequires:  %{_bindir}/pod2man
@@ -44,6 +45,7 @@ developing applications that use libnet.
 
 %prep
 %setup -q
+%patch0 -p1
 # Avoid library soname bump (https://github.com/libnet/libnet/issues/115)
 sed -e 's/-version-info 9:0:0/-version-info 9:0:8/' -i src/Makefile.{am,in}
 
@@ -93,6 +95,9 @@ done
 %endif
 
 %changelog
+* Thu Apr 08 2021 Adrian Reber <adrian@lisas.de> - 1.2-3
+- Fix file conflicts with libnet-devel
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild