- fix BuildRoot

- add Requires: pkgconfig for curl-devel
- move LDFLAGS and LIBS to Libs.private in libcurl.pc.in (#213278)
    Resolves: #213278
This commit is contained in:
Jindrich Novy 2006-10-31 16:25:49 +00:00
parent f25b2a9485
commit d6b84330d3
2 changed files with 21 additions and 3 deletions

View File

@ -0,0 +1,10 @@
--- curl-7.16.0/libcurl.pc.in.LIBS_PRIVATE 2004-12-11 12:46:40.000000000 -0600
+++ curl-7.16.0/libcurl.pc.in 2006-10-31 10:05:30.000000000 -0600
@@ -6,5 +6,6 @@
Name: libcurl
Description: Library to transfer files with ftp, http, etc.
Version: @VERSION@
-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+Libs: -L${libdir} -lcurl
+Libs.private: @LDFLAGS@ @LIBS@
Cflags: -I${includedir}

View File

@ -1,15 +1,16 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others). Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
Name: curl Name: curl
Version: 7.16.0 Version: 7.16.0
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
Group: Applications/Internet Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
Patch0: curl-7.14.1-nousr.patch Patch0: curl-7.14.1-nousr.patch
Patch1: curl-7.15.0-curl_config-version.patch Patch1: curl-7.15.0-curl_config-version.patch
Patch2: curl-7.15.3-multilib.patch Patch2: curl-7.15.3-multilib.patch
Patch3: curl-7.16.0-privlibs.patch
URL: http://curl.haxx.se/ URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
Requires: openssl Requires: openssl
@ -22,7 +23,8 @@ authentication, FTP upload, HTTP post, and file transfer resume.
%package devel %package devel
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release}, openssl-devel, libidn-devel Requires: %{name} = %{version}-%{release}
Requires: openssl-devel, libidn-devel, pkgconfig
Summary: Files needed for building applications with libcurl. Summary: Files needed for building applications with libcurl.
%description devel %description devel
@ -38,6 +40,7 @@ rm -rf $RPM_BUILD_ROOT
%patch0 -p1 -b .nousr %patch0 -p1 -b .nousr
%patch1 -p1 -b .ver %patch1 -p1 -b .ver
%patch2 -p1 -b .multilib %patch2 -p1 -b .multilib
%patch3 -p1 -b .privlibs
%build %build
aclocal aclocal
@ -94,6 +97,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/* %{_mandir}/man3/*
%changelog %changelog
* Tue Oct 31 2006 Jindrich Novy <jnovy@redhat.com> - 7.16.0-2
- fix BuildRoot
- add Requires: pkgconfig for curl-devel
- move LDFLAGS and LIBS to Libs.private in libcurl.pc.in (#213278)
* Mon Oct 30 2006 Jindrich Novy <jnovy@redhat.com> - 7.16.0-1 * Mon Oct 30 2006 Jindrich Novy <jnovy@redhat.com> - 7.16.0-1
- update to curl-7.16.0 - update to curl-7.16.0