SHA256
1
0
forked from pool/curl

- remove mozilla-nss code (unsupported since 8.3.0)

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=367
This commit is contained in:
Pedro Monreal Gonzalez 2024-06-20 14:55:43 +00:00 committed by Git OBS Bridge
parent 06860bdfca
commit 1559703829
2 changed files with 9 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jun 17 21:29:09 UTC 2024 - Dirk Müller <dmueller@suse.com>
- remove mozilla-nss code (unsupported since 8.3.0)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 24 11:05:25 UTC 2024 - Pedro Monreal <pmonreal@suse.com> Fri May 24 11:05:25 UTC 2024 - Pedro Monreal <pmonreal@suse.com>

View File

@ -17,7 +17,6 @@
%bcond_without testsuite %bcond_without testsuite
%bcond_with mozilla_nss
# need ssl always for python-pycurl # need ssl always for python-pycurl
%bcond_without openssl %bcond_without openssl
Name: curl Name: curl
@ -37,12 +36,11 @@ Patch2: curl-secure-getenv.patch
Patch3: curl-disabled-redirect-protocol-message.patch Patch3: curl-disabled-redirect-protocol-message.patch
#PATCH-FIX-UPSTREAM Fix make install for curl-config.1 github.com/curl/curl/pull/13741 #PATCH-FIX-UPSTREAM Fix make install for curl-config.1 github.com/curl/curl/pull/13741
Patch4: curl-make-install-curl-config.patch Patch4: curl-make-install-curl-config.patch
BuildRequires: libtool
BuildRequires: pkgconfig
Requires: libcurl4 = %{version}
BuildRequires: groff BuildRequires: groff
BuildRequires: libtool
BuildRequires: lzma BuildRequires: lzma
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: pkgconfig
BuildRequires: pkgconfig(krb5) BuildRequires: pkgconfig(krb5)
BuildRequires: pkgconfig(libbrotlidec) BuildRequires: pkgconfig(libbrotlidec)
BuildRequires: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2)
@ -53,12 +51,10 @@ BuildRequires: pkgconfig(libpsl)
BuildRequires: pkgconfig(libssh) BuildRequires: pkgconfig(libssh)
BuildRequires: pkgconfig(libzstd) BuildRequires: pkgconfig(libzstd)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
Requires: libcurl4 = %{version}
%if %{with openssl} %if %{with openssl}
BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libssl)
%endif %endif
%if %{with mozilla_nss}
BuildRequires: mozilla-nss-devel
%endif
#BuildRequires: openssh #BuildRequires: openssh
%if 0%{?_with_stunnel:1} %if 0%{?_with_stunnel:1}
# used by the testsuite # used by the testsuite
@ -93,8 +89,8 @@ user interaction or any kind of interactivity.
%package -n libcurl-devel-doc %package -n libcurl-devel-doc
Summary: Manual pages for libcurl Summary: Manual pages for libcurl
BuildArch: noarch
Provides: libcurl-devel:%{_mandir}/man1/curl-config.1%{?ext_man} Provides: libcurl-devel:%{_mandir}/man1/curl-config.1%{?ext_man}
BuildArch: noarch
%description -n libcurl-devel-doc %description -n libcurl-devel-doc
Manual pages for the libcurl C API. Manual pages for the libcurl C API.
@ -124,9 +120,6 @@ sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure
--without-ca-bundle \ --without-ca-bundle \
%else %else
--without-openssl \ --without-openssl \
%if %{with mozilla_nss}
--with-nss \
%endif
%endif %endif
--with-gssapi=$(krb5-config --prefix) \ --with-gssapi=$(krb5-config --prefix) \
--with-libidn2 \ --with-libidn2 \