diff --git a/SPECS-EXTENDED/neon/neon.signatures.json b/SPECS-EXTENDED/neon/neon.signatures.json index e9f3ca4fe98..f1c3e336b60 100644 --- a/SPECS-EXTENDED/neon/neon.signatures.json +++ b/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" } } diff --git a/SPECS-EXTENDED/neon/neon.spec b/SPECS-EXTENDED/neon/neon.spec index 5ecdd4de4e0..df5ee262b9a 100644 --- a/SPECS-EXTENDED/neon/neon.spec +++ b/SPECS-EXTENDED/neon/neon.spec @@ -1,19 +1,38 @@ Vendor: Microsoft Corporation Distribution: Azure Linux + + %bcond_without tests +%if 0%{?fedora} +%bcond_without pkcs11 +%else +%bcond_with pkcs11 +%endif +%if 0%{?fedora} +%bcond_without libproxy +%else +%bcond_with libproxy +%endif + +# 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: 1%{?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, 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 @@ -31,29 +50,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,6 +103,10 @@ make %{?_smp_mflags} check %{_libdir}/*.so %changelog +* Tue Dec 17 2024 Durga Jagadeesh Palli - 0.33.0-1 +- update to 0.33.0 +- License verified + * Fri Oct 15 2021 Pawel Winogrodzki - 0.31.2-2 - Initial CBL-Mariner import from Fedora 32 (license: MIT). diff --git a/cgmanifest.json b/cgmanifest.json index e724680b882..247bca849d2 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -13862,8 +13862,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" } } },