pool/curl
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 286144 from home:pluskalm:branches:devel:libraries:c_c++

Browse Source 
- Re-enable metalink supoort
- Use pkgconfig() style dependencies

OBS-URL: https://build.opensuse.org/request/show/286144
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/curl?expand=0&rev=123
This commit is contained in:
Cristian Rodríguez 2015-02-15 17:07:47 +00:00 committed by Git OBS Bridge
parent 1ba1e0ce69
commit d124d7009f
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
curl.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Feb 14 18:29:37 UTC 2015 - mpluskal@suse.com
- Re-enable metalink supoort
- Use pkgconfig() style dependencies
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 8 09:55:11 UTC 2015 - vcizek@suse.com Thu Jan 8 09:55:11 UTC 2015 - vcizek@suse.com

14
curl.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package curl # spec file for package curl
# #
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -34,17 +34,18 @@ Patch0: libcurl-ocloexec.patch
Patch1: dont-mess-with-rpmoptflags.diff Patch1: dont-mess-with-rpmoptflags.diff
Patch3: curl-secure-getenv.patch Patch3: curl-secure-getenv.patch
BuildRequires: krb5-mini-devel BuildRequires: krb5-mini-devel
BuildRequires: libidn-devel
BuildRequires: libssh2-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: lzma BuildRequires: lzma
BuildRequires: openldap2-devel BuildRequires: openldap2-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: zlib-devel BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(libmetalink)
BuildRequires: pkgconfig(libssh2)
BuildRequires: pkgconfig(zlib)
Requires: libcurl4 = %{version} Requires: libcurl4 = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with openssl} %if %{with openssl}
BuildRequires: openssl-devel BuildRequires: pkgconfig(libssl)
%endif %endif
%if %{with mozilla_nss} %if %{with mozilla_nss}
BuildRequires: mozilla-nss-devel BuildRequires: mozilla-nss-devel
@ -122,7 +123,8 @@ sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure
--with-libssh2\ --with-libssh2\
--enable-hidden-symbols \ --enable-hidden-symbols \
--disable-static \ --disable-static \
--enable-threaded-resolver --enable-threaded-resolver \
--with-libmetalink
: if this fails, the above sed hack did not work : if this fails, the above sed hack did not work
./libtool --config | grep -q link_all_deplibs=no ./libtool --config | grep -q link_all_deplibs=no