From a07db3aa2f9c8b0d605ac5195d57a072f990c179 Mon Sep 17 00:00:00 2001 From: songnannan Date: Thu, 9 Apr 2020 21:55:19 +0800 Subject: [PATCH] split out the libcurl and libcurl-devel packages --- curl.spec | 68 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/curl.spec b/curl.spec index 453d6f2..60e9e84 100644 --- a/curl.spec +++ b/curl.spec @@ -6,7 +6,7 @@ Name: curl Version: 7.66.0 -Release: 2 +Release: 3 Summary: Curl is used in command lines or scripts to transfer data License: MIT URL: https://curl.haxx.se/ @@ -33,34 +33,32 @@ BuildRequires: perl(Time::Local) perl(Time::HiRes) perl(vars) BuildRequires: valgrind %endif -Requires: libpsl >= %{libpsl_version} libssh >= %{libssh_version} -Requires: openssl-libs >= 1:%{openssl_version} - -Provides: curl-full = %{version}-%{release} libcurl-full = %{version}-%{release} -Provides: webclient libcurl = %{version}-%{release} -Obsoletes: libcurl < %{version}-%{release} +Requires: libcurl = %{version}-%{release} +Provides: curl-full = %{version}-%{release} webclient %description cURL is a computer software project providing a library (libcurl) and command-line tool (curl) for transferring data using various protocols. -%package devel -Summary: Files needed for building applications with libcurl -Requires: curl = %{version}-%{release} -Provides: curl-devel = %{version}-%{release} -Provides: libcurl-devel = %{version}-%{release} -Obsoletes: curl-devel < %{version}-%{release} -Obsoletes: libcurl-devel < %{version}-%{release} +%package -n libcurl +Summary: A library for getting files from web servers +Requires: libssh >= %{libssh_version} libpsl >= %{libpsl_version} +Requires: openssl-libs >= 1:%{openssl_version} +Provides: libcurl-full = %{version}-%{release} -%description devel -The curl-devel package includes header files and libraries necessary for developing programs. +%description -n libcurl +A library for getting files from web servers. -%package help -Summary: Documents for autogen -Buildarch: noarch +%package -n libcurl-devel +Summary: Header files for libcurl +Requires: libcurl = %{version}-%{release} +Provides: curl-devel = %{version}-%{release} +Obsoletes: curl-devel < %{version}-%{release} + +%description -n libcurl-devel +Header files for libcurl. -%description help -Man pages and other related documents. +%package_help %prep %autosetup -n %{name}-%{version} -p1 @@ -79,15 +77,12 @@ sed -e 's/^35$/35,52/' -i tests/data/test323 %build install -d build-full -export common_configure_opts=" \ - --cache-file=../config.cache \ - --disable-static \ - --enable-symbol-hiding \ - --enable-ipv6 \ - --enable-threaded-resolver \ - --with-gssapi \ - --with-nghttp2 \ - --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt" +export common_configure_opts="--cache-file=../config.cache \ + --enable-symbol-hiding --enable-ipv6 --enable-threaded-resolver \ + --with-gssapi --with-nghttp2 --with-ssl \ + --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt" + +%global _configure ../configure # configure full build ( @@ -126,19 +121,25 @@ LD_LIBRARY_PATH="$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH" %make_install -C sc # by fish-3.0.2-1.module_f31+3716+57207597 and would trigger a conflict rm -rf ${RPM_BUILD_ROOT}%{_datadir}/fish -rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la +rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.a +rm -rf ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %ldconfig_scriptlets +%ldconfig_scriptlets -n libcurl + %files %defattr(-,root,root) %license COPYING %{_bindir}/curl %{_datadir}/zsh + +%files -n libcurl +%defattr(-,root,root) %{_libdir}/libcurl.so.4 %{_libdir}/libcurl.so.4.[0-9].[0-9] -%files devel +%files -n libcurl-devel %defattr(-,root,root) %doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS.md %doc docs/CONTRIBUTE.md docs/libcurl/ABI @@ -158,6 +159,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_mandir}/man3/* %changelog +* Thu Apr 9 2020 songnannan - 7.66.0-3 +- split out the libcurl and libcurl-devel package + * Tue Mar 17 2020 chenzhen - 7.66.0-2 - Type:cves - ID:CVE-2019-15601 -- Gitee