From 48bcb21242f36f72ee5480c0c19f814f83181e92 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Thu, 27 Jan 2022 09:36:48 +0000
Subject: [PATCH] strip LIBS exported by neon-config to the minimum

---
 ...ltilib.patch => neon-0.32.2-multilib.patch | 24 ++++++++++++-------
 neon.spec                                     |  7 ++++--
 2 files changed, 20 insertions(+), 11 deletions(-)
 rename neon-0.27.0-multilib.patch => neon-0.32.2-multilib.patch (77%)

diff --git a/neon-0.27.0-multilib.patch b/neon-0.32.2-multilib.patch
similarity index 77%
rename from neon-0.27.0-multilib.patch
rename to neon-0.32.2-multilib.patch
index 5f8f86d..a219792 100644
--- a/neon-0.27.0-multilib.patch
+++ b/neon-0.32.2-multilib.patch
@@ -1,5 +1,5 @@
---- neon-0.27.0/neon-config.in.multilib
-+++ neon-0.27.0/neon-config.in
+--- neon-0.32.2/neon-config.in.multilib
++++ neon-0.32.2/neon-config.in
 @@ -5,7 +5,11 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -22,7 +22,7 @@
      i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
  
  EOF
-@@ -69,11 +73,10 @@
+@@ -69,16 +73,11 @@
  	;;
  
      --cflags)
@@ -32,10 +32,16 @@
  
      --libs)
 -        LIBS="-lneon @NEON_LIBS@"
- 	# Don't add standard library paths
-         if test "$prefix" != "/usr"; then
-            LIBS="-L${libdir} ${LIBS}"
-@@ -93,7 +96,7 @@
+-	# Don't add standard library paths
+-        if test "$prefix" != "/usr"; then
+-           LIBS="-L${libdir} ${LIBS}"
+-        fi
+-	echo @user_LDFLAGS@ ${LIBS}
++	echo ${LIBS}
+ 	;;
+ 
+     --la-file)
+@@ -93,7 +92,7 @@
  	zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
  	ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
  	dav|DAV) support @NE_FLAG_DAV@ ;;
@@ -44,8 +50,8 @@
  	i18n|I18N) support @NE_FLAG_I18N@ ;;
  	ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;;
  	*) support no ;;
---- neon-0.27.0/neon.pc.in.multilib
-+++ neon-0.27.0/neon.pc.in
+--- neon-0.32.2/neon.pc.in.multilib
++++ neon-0.32.2/neon.pc.in
 @@ -2,6 +2,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@
diff --git a/neon.spec b/neon.spec
index a415f23..13a5c2d 100644
--- a/neon.spec
+++ b/neon.spec
@@ -13,11 +13,11 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.32.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 URL: https://notroj.github.io/neon/
 Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz
-Patch0: neon-0.27.0-multilib.patch
+Patch0: neon-0.32.2-multilib.patch
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig, make, gcc, xmlto
 %if %{with pkcs11}
@@ -97,6 +97,9 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 
 %changelog
+* Thu Jan 27 2022 Joe Orton <jorton@redhat.com> - 0.32.2-3
+- strip LIBS exported by neon-config to the minimum
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.32.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild