diff --git a/neon-0.27.0-multilib.patch b/neon-0.27.0-multilib.patch deleted file mode 100644 index 5f8f86d..0000000 --- a/neon-0.27.0-multilib.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- neon-0.27.0/neon-config.in.multilib -+++ neon-0.27.0/neon-config.in -@@ -5,7 +5,11 @@ - prefix=@prefix@ - exec_prefix=@exec_prefix@ - includedir=@includedir@ --libdir=@libdir@ -+ -+libdir=`pkg-config --variable=libdir neon` -+CFLAGS=`pkg-config --cflags neon` -+LIBS=`pkg-config --libs neon` -+has_lfs=`pkg-config --variable=has_lfs neon` - - usage() - { -@@ -23,7 +27,7 @@ - --support FEATURE exit with success if feature is supported - - Known features: -- dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@], -+ dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}], - i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@] - - EOF -@@ -69,11 +73,10 @@ - ;; - - --cflags) -- echo -I${includedir}/neon @NEON_CFLAGS@ -+ echo ${CFLAGS} - ;; - - --libs) -- LIBS="-lneon @NEON_LIBS@" - # Don't add standard library paths - if test "$prefix" != "/usr"; then - LIBS="-L${libdir} ${LIBS}" -@@ -93,7 +96,7 @@ - zlib|ZLIB) support @NE_FLAG_ZLIB@ ;; - ipv6|IPV6) support @NE_FLAG_IPV6@ ;; - dav|DAV) support @NE_FLAG_DAV@ ;; -- lfs|LFS) support @NE_FLAG_LFS@ ;; -+ lfs|LFS) support ${has_lfs} ;; - 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 -@@ -2,6 +2,7 @@ - exec_prefix=@exec_prefix@ - libdir=@libdir@ - includedir=@includedir@ -+has_lfs=@NE_FLAG_LFS@ - - Name: neon - Description: HTTP/WebDAV client library diff --git a/neon-0.32.2-multilib.patch b/neon-0.32.2-multilib.patch new file mode 100644 index 0000000..a219792 --- /dev/null +++ b/neon-0.32.2-multilib.patch @@ -0,0 +1,62 @@ +--- 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@ + includedir=@includedir@ +-libdir=@libdir@ ++ ++libdir=`pkg-config --variable=libdir neon` ++CFLAGS=`pkg-config --cflags neon` ++LIBS=`pkg-config --libs neon` ++has_lfs=`pkg-config --variable=has_lfs neon` + + usage() + { +@@ -23,7 +27,7 @@ + --support FEATURE exit with success if feature is supported + + Known features: +- dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [@NE_FLAG_LFS@], ++ dav [@NE_FLAG_DAV@], ssl [@NE_FLAG_SSL@], zlib [@NE_FLAG_ZLIB@], ipv6 [@NE_FLAG_IPV6@], lfs [${has_lfs}], + i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@] + + EOF +@@ -69,16 +73,11 @@ + ;; + + --cflags) +- echo -I${includedir}/neon @NEON_CFLAGS@ ++ echo ${CFLAGS} + ;; + + --libs) +- LIBS="-lneon @NEON_LIBS@" +- # 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@ ;; +- lfs|LFS) support @NE_FLAG_LFS@ ;; ++ lfs|LFS) support ${has_lfs} ;; + i18n|I18N) support @NE_FLAG_I18N@ ;; + ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;; + *) support no ;; +--- 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@ + includedir=@includedir@ ++has_lfs=@NE_FLAG_LFS@ + + Name: neon + Description: HTTP/WebDAV client library 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 - 0.32.2-3 +- strip LIBS exported by neon-config to the minimum + * Thu Jan 20 2022 Fedora Release Engineering - 0.32.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild