From a6308992ef552e47ae3d41d80a487f39e12f0700 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Tue, 21 Sep 2021 08:50:27 +0100
Subject: [PATCH] update to 0.32.1 add bcond for libproxy support

---
 .gitignore               |  1 +
 neon-0.32.0-cflags.patch | 22 ----------------------
 neon.spec                | 27 ++++++++++++++++++++-------
 sources                  |  2 +-
 4 files changed, 22 insertions(+), 30 deletions(-)
 delete mode 100644 neon-0.32.0-cflags.patch

diff --git a/.gitignore b/.gitignore
index 0b4c568..e3a55aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ neon-0.29.2.tar.gz
 /results_neon
 /neon-0.31.2.tar.gz
 /neon-0.32.0.tar.gz
+/neon-0.32.1.tar.gz
diff --git a/neon-0.32.0-cflags.patch b/neon-0.32.0-cflags.patch
deleted file mode 100644
index 2d9e018..0000000
--- a/neon-0.32.0-cflags.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- neon-0.32.0/macros/neon.m4.cflags
-+++ neon-0.32.0/macros/neon.m4
-@@ -1106,8 +1106,8 @@
- AC_DEFUN([NEON_GSSAPI], [
- AC_ARG_WITH(gssapi, AS_HELP_STRING(--without-gssapi, disable GSSAPI support))
- if test "$with_gssapi" != "no"; then
--  ne_save_CFLAGS=$CFLAGS
--  ne_save_LIBS=$NEON_LIBS
-+  ne_save_CFLAGS="$CFLAGS"
-+  ne_save_LIBS="$NEON_LIBS"
-   NE_PKG_CONFIG(NE_GSSAPI, [krb5-gssapi],
-     [AC_MSG_NOTICE(using GSSAPI configuration from pkg-config)
-      KRB5_CONF_TOOL=pkgconf],
-@@ -1142,7 +1142,7 @@
- #endif])])
-      break
-    ])
--   CFLAGS=$ne_save_CPPFLAGS
-+   CFLAGS=$ne_save_CFLAGS
-    NEON_LIBS=$ne_save_LIBS
- fi])
- 
diff --git a/neon.spec b/neon.spec
index e1d46c7..01879f9 100644
--- a/neon.spec
+++ b/neon.spec
@@ -4,21 +4,28 @@
 %else
 %bcond_with pkcs11
 %endif
+%if 0%{?fedora}
+%bcond_without libproxy
+%else
+%bcond_with libproxy
+%endif
 
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.32.0
+Version: 0.32.1
 Release: 1%{?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
-Patch1: neon-0.32.0-cflags.patch
-BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel
-BuildRequires: pkgconfig, make, gcc, autoconf, xmlto
+BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
+BuildRequires: pkgconfig, make, gcc, xmlto
 %if %{with pkcs11}
 BuildRequires: pakchois-devel
 %endif
+%if %{with libproxy}
+BuildRequires: libproxy-devel
+%endif
 %if %{with tests}
 # SSL tests require openssl binary, PKCS#11 testing need certutil
 BuildRequires: /usr/bin/perl, /usr/bin/openssl, /usr/bin/certutil
@@ -44,17 +51,19 @@ The development library for the C language HTTP and WebDAV client library.
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .cflags
-autoconf
 
 # prevent installation of HTML docs
-sed -ibak '/^install-docs/s/install-html//' Makefile.in
+sed -i '/^install-docs/s/install-html//' Makefile.in
 
 %build
 %configure --with-expat --enable-shared --disable-static \
         --enable-warnings \
         --with-ssl=openssl --enable-threadsafe-ssl=posix \
+%if %{with libproxy}
         --with-libproxy
+%else
+        --without-libproxy
+%endif
 %make_build
 
 %install
@@ -88,6 +97,10 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 
 %changelog
+* Tue Sep 21 2021 Joe Orton <jorton@redhat.com> - 0.32.1-1
+- update to 0.32.1
+- add bcond for libproxy support
+
 * Mon Sep 20 2021 Joe Orton <jorton@redhat.com> - 0.32.0-1
 - update to 0.32.0
 
diff --git a/sources b/sources
index c9abfba..55faeb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neon-0.32.0.tar.gz) = c5f27b41379955736730cd6bb8908e21e3fd3a1379730deceaec5a46ab22c7c3c08fca591d15e6c2ca91b7be66c6c3f73479b97608637710eba5959f16511338
+SHA512 (neon-0.32.1.tar.gz) = a231865c3aad3668f6effded97a58eb981655f64c71b0954fcb2e667bdec50895d11bf296f4f454bd63e6ce9b02c2fd13cbb17cb82631e16f100000ecd7e1977