From e796fcafcb9ba49ad165c68e6b9bb8116cc72d89 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Mon, 20 Mar 2017 22:09:06 +0300 Subject: [PATCH 1/2] Removed unnecessary ea-libcurl, ea-libcurl-devel, valgrind and perl* Provides. --- SPECS/libcurl.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/SPECS/libcurl.spec b/SPECS/libcurl.spec index d2b545d..59d1879 100644 --- a/SPECS/libcurl.spec +++ b/SPECS/libcurl.spec @@ -14,7 +14,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: %{pkg_name} Version: 7.53.1 -%define release_prefix 1 +%define release_prefix 2 Release: %{release_prefix}%{?dist}.cpanel License: MIT Vendor: cPanel, Inc. @@ -22,8 +22,6 @@ Group: Applications/Internet Source: %{pkg_name}-%{version}.tar.gz URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-%{release}-root -Provides: ea-libcurl -Provides: valgrind, perl(getpart), perl(valgrind), perl(directories), perl(ftp) Requires: openssl BuildRequires: openssl-devel @@ -44,7 +42,6 @@ authentication, ftp upload, HTTP post, file transfer resume and more. Summary: The includes, libs, and man pages to develop with libcurl Group: Development/Libraries Requires: openssl-devel -Provides: ea-libcurl-devel %description devel libcurl is the core engine of curl; this packages contains all the libs, @@ -117,6 +114,10 @@ install -m 755 -d %{buildroot}%{_defaultdocdir} %dir %{_defaultdocdir} %changelog +* Mon Mar 20 2017 Eugene Zamriy - 7.53.1-2 +- Removed unnecessary ea-libcurl and ea-libcurl-devel Provides +- Removed wrong valgrind and perl* Provides + * Mon Mar 13 2017 Jacob Perkins - 7.53.1-1 - Updated to 7.53.1 From e5beed7c521410c8ac6a4cb4c6a57d52fac72223 Mon Sep 17 00:00:00 2001 From: Eugene Zamriy Date: Tue, 28 Mar 2017 16:22:51 +0300 Subject: [PATCH 2/2] Disable automatic provides and requirements, manually specify dependencies: libssh2, openldap, krb5-libs. --- SPECS/libcurl.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/SPECS/libcurl.spec b/SPECS/libcurl.spec index 59d1879..078ab2e 100644 --- a/SPECS/libcurl.spec +++ b/SPECS/libcurl.spec @@ -23,12 +23,19 @@ Source: %{pkg_name}-%{version}.tar.gz URL: http://curl.haxx.se/ BuildRoot: %{_tmppath}/%{pkg_name}-%{version}-%{release}-root +Autoreq: 0 +Autoprov: 0 + Requires: openssl +Requires: libssh2 +Requires: openldap +Requires: krb5-libs BuildRequires: openssl-devel BuildRequires: valgrind BuildRequires: libidn libidn-devel BuildRequires: libssh2 libssh2-devel BuildRequires: openldap openldap-devel +BuildRequires: krb5-devel %description curl is a client to get documents/files from servers, using any of the @@ -115,8 +122,10 @@ install -m 755 -d %{buildroot}%{_defaultdocdir} %changelog * Mon Mar 20 2017 Eugene Zamriy - 7.53.1-2 -- Removed unnecessary ea-libcurl and ea-libcurl-devel Provides -- Removed wrong valgrind and perl* Provides +- Disable automatic Requires generation to avoid broken dependencies +- Disable automatic Provides generation to avoid conflicts with system curl +- Added libssh2, openldap, krb5-libs requirements +- Added krb5-devel build requirement * Mon Mar 13 2017 Jacob Perkins - 7.53.1-1 - Updated to 7.53.1