neon: update to 0.33.0 (#11484)

SPECS-EXTENDED/neon/neon-0.27.0-multilib.patch → SPECS-EXTENDED/neon/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@

SPECS-EXTENDED/neon/neon.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "neon-0.31.2.tar.gz": "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"
+  "neon-0.33.0.tar.gz": "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8"
  }
 }

SPECS-EXTENDED/neon/neon.spec

@@ -1,19 +1,39 @@
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
+
 %bcond_without tests
 
+%bcond_with pkcs11
+
+%bcond_with libproxy
+
+# Disable automatic .la file removal
+%global __brp_remove_la_files %nil
+
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.31.2
-Release: 2%{?dist}
-License: LGPLv2+
+Version: 0.33.0
+Release: 3%{?dist}
+License: LGPL-2.0-or-later
 URL: https://notroj.github.io/neon/
 Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz
-Patch0: neon-0.27.0-multilib.patch
-BuildRequires:  gcc-c++
-BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel
-BuildRequires: pkgconfig, pakchois-devel
-Requires: ca-certificates
+Patch0: neon-0.32.2-multilib.patch
+BuildRequires: expat-devel
+BuildRequires: openssl-devel
+BuildRequires: zlib-devel
+BuildRequires: krb5-devel
+
+BuildRequires: pkgconfig
+BuildRequires: make
+BuildRequires: gcc
+BuildRequires: 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
@@ -31,29 +51,31 @@ Summary: Development libraries and C header files for the neon library
 Requires: neon = %{version}-%{release}, openssl-devel, zlib-devel, expat-devel
 Requires: pkgconfig
 # Documentation is GPLv2+
-License: LGPLv2+ and GPLv2+
+License: LGPL-2.0-or-later AND GPL-2.0-or-later
 
 %description devel
 The development library for the C language HTTP and WebDAV client library.
 
 %prep
-%setup -q
-%patch 0 -p1 -b .multilib
+%autosetup -p1
 
 # prevent installation of HTML docs
-sed -ibak '/^install-docs/s/install-html//' Makefile.in
+sed -i '/^install-docs/s/install-html//' Makefile.in
 
 %build
-export CC="%{__cc} -pthread"
 %configure --with-expat --enable-shared --disable-static \
         --enable-warnings \
         --with-ssl=openssl --enable-threadsafe-ssl=posix \
+%if %{with libproxy}
         --with-libproxy
-make %{?_smp_mflags}
+%else
+        --without-libproxy
+%endif
+%make_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
+%make_install
 
 sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
       $RPM_BUILD_ROOT%{_libdir}/libneon.la
@@ -82,8 +104,82 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 
 %changelog
-* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.31.2-2
-- Initial CBL-Mariner import from Fedora 32 (license: MIT).
+* Tue Dec 17 2024 Durga Jagadeesh Palli <[email protected]> - 0.33.0-3
+- Initial Azure Linux import from Fedora 41 (license: MIT)
+- License verified
+
+* Thu Jul 18 2024 Fedora Release Engineering <[email protected]> - 0.33.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jan 30 2024 Joe Orton <[email protected]> - 0.33.0-1
+- update to 0.33.0
+
+* Thu Jan 25 2024 Fedora Release Engineering <[email protected]> - 0.32.5-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <[email protected]> - 0.32.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Sep 29 2023 Joe Orton <[email protected]> - 0.32.5-3
+- migrated to SPDX license
+
+* Thu Jul 20 2023 Fedora Release Engineering <[email protected]> - 0.32.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Mon Jan 23 2023 Joe Orton <[email protected]> - 0.32.5-1
+- update to 0.32.5
+
+* Thu Jan 19 2023 Fedora Release Engineering <[email protected]> - 0.32.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Sep  5 2022 Joe Orton <[email protected]> - 0.32.3-1
+- update to 0.32.3
+
+* Fri Jul 22 2022 Fedora Release Engineering <[email protected]> - 0.32.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 27 2022 Timm Bäder <[email protected]> - 0.32.2-4
+- Disable automatic .la file removal
+- https://fedoraproject.org/wiki/Changes/RemoveLaFiles
+
+* Thu Jan 27 2022 Joe Orton <[email protected]> - 0.32.2-3
+- strip LIBS exported by neon-config to the minimum
+
+* Thu Jan 20 2022 Fedora Release Engineering <[email protected]> - 0.32.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jan 13 2022 Joe Orton <[email protected]> - 0.32.2-1
+- update to 0.32.2
+
+* Tue Sep 21 2021 Joe Orton <[email protected]> - 0.32.1-1
+- update to 0.32.1
+- add bcond for libproxy support
+
+* Mon Sep 20 2021 Joe Orton <[email protected]> - 0.32.0-1
+- update to 0.32.0
+
+* Tue Sep 14 2021 Sahana Prasad <[email protected]> - 0.31.2-8
+- Rebuilt with OpenSSL 3.0.0
+
+* Thu Jul 22 2021 Fedora Release Engineering <[email protected]> - 0.31.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Feb  4 2021 Joe Orton <[email protected]> - 0.31.2-6
+- add bcond for PKCS#11 support
+- use make macros
+
+* Tue Jan 26 2021 Fedora Release Engineering <[email protected]> - 0.31.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Aug 26 2020 Joe Orton <[email protected]> - 0.31.2-4
+- fix tests with current OpenSSL (#1863681)
+
+* Sat Aug 01 2020 Fedora Release Engineering <[email protected]> - 0.31.2-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <[email protected]> - 0.31.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
 * Wed Jun 24 2020 Joe Orton <[email protected]> - 0.31.2-1
 - update to 0.31.2

cgmanifest.json

@@ -13992,8 +13992,8 @@
         "type": "other",
         "other": {
           "name": "neon",
-          "version": "0.31.2",
-          "downloadUrl": "https://notroj.github.io/neon/neon-0.31.2.tar.gz"
+          "version": "0.33.0",
+          "downloadUrl": "https://notroj.github.io/neon/neon-0.33.0.tar.gz"
         }
       }
     },