rpms/curl/F-8 .cvsignore, 1.26, 1.27 curl-7.15.3-multilib.patch, 1.2, 1.3 curl.spec, 1.64, 1.65 sources, 1.28, 1.29
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Thu Jun 19 05:34:40 UTC 2008
Author: jnovy
Update of /cvs/extras/rpms/curl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13203
Modified Files:
.cvsignore curl-7.15.3-multilib.patch curl.spec sources
Log Message:
* Thu Jun 19 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-1
- update to 7.18.2 (fixes #397911)
- fix curl_multi_perform() over a proxy (#450140), thanks to
Rob Crittenden
- spec cleanup, thanks to Paul Howarth (#225671)
- drop BR: libtool
- convert CHANGES and README to UTF-8
- _GNU_SOURCE in CFLAGS is no more needed
- remove bogus rpath
- add ABI docs for libcurl
- drop curl-config patch, obsoleted by @SSL_ENABLED@ autoconf
substitution (#432667)
- drop sslgen patch -> applied upstream
- add BuildRequires krb5-devel to build curl with GSSAPI
negotiate support (#442069)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/F-8/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- .cvsignore 11 Jul 2007 07:47:08 -0000 1.26
+++ .cvsignore 19 Jun 2008 05:33:25 -0000 1.27
@@ -1,7 +1 @@
-curl-7.15.4.tar.bz2
-curl-7.15.5.tar.bz2
-curl-7.16.0.tar.bz2
-curl-7.16.1.tar.bz2
-curl-7.16.2.tar.bz2
-curl-7.16.3.tar.bz2
-curl-7.16.4.tar.bz2
+curl-7.18.2.tar.bz2
curl-7.15.3-multilib.patch:
Index: curl-7.15.3-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/F-8/curl-7.15.3-multilib.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- curl-7.15.3-multilib.patch 11 Apr 2007 18:20:54 -0000 1.2
+++ curl-7.15.3-multilib.patch 19 Jun 2008 05:33:25 -0000 1.3
@@ -1,6 +1,15 @@
---- curl-7.16.2/curl-config.in.multilib 2007-02-18 10:41:27.000000000 +0100
-+++ curl-7.16.2/curl-config.in 2007-04-11 20:00:16.000000000 +0200
-@@ -71,7 +71,7 @@
+diff -up curl-7.18.0/curl-config.in.multilib curl-7.18.0/curl-config.in
+--- curl-7.18.0/curl-config.in.multilib 2008-01-10 23:14:02.000000000 +0100
++++ curl-7.18.0/curl-config.in 2008-02-16 06:48:14.000000000 +0100
+@@ -45,7 +45,6 @@
+ --libs library linking information
+ --prefix curl install prefix
+ --protocols newline separated list of enabled protocols
+- --static-libs static libcurl library linking information
+ --version output version information
+ --vernum output the version information as a number (hexadecimal)
+ EOF
+@@ -72,7 +71,7 @@
;;
--cc)
@@ -9,11 +18,11 @@
;;
--prefix)
-@@ -181,16 +181,7 @@
+@@ -189,20 +188,7 @@
;;
--libs)
-- if test "X at libdir@" != "X/usr/lib"; then
+- if test "X at libdir@" != "X/usr/lib" -a "X at libdir@" != "X/usr/lib64"; then
- CURLLIBDIR="-L at libdir@ "
- else
- CURLLIBDIR=""
@@ -23,6 +32,10 @@
- else
- echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
- fi
+- ;;
+-
+- --static-libs)
+- echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+ pkg-config libcurl --libs
;;
Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-8/curl.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- curl.spec 14 Apr 2008 06:13:53 -0000 1.64
+++ curl.spec 19 Jun 2008 05:33:25 -0000 1.65
@@ -2,31 +2,29 @@
%define ldap_version %(readlink %{_libdir}/libldap.so | sed 's,.*libldap-\\([0-9.]*\\)\\.so\\..*,\\1,')
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
-Name: curl
-Version: 7.17.1
-Release: 3%{?dist}
+Name: curl
+Version: 7.18.2
+Release: 1%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
Patch1: curl-7.15.3-multilib.patch
Patch2: curl-7.16.0-privlibs.patch
-Patch3: curl-7.16.4-curl-config.patch
-Patch4: curl-7.17.1-sslgen.patch
-Patch5: curl-7.17.1-badsocket.patch
+Patch3: curl-7.17.1-badsocket.patch
+Patch4: curl-7.18.2-nssproxy.patch
Provides: webclient
URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, pkgconfig, libidn-devel, zlib-devel
+BuildRequires: pkgconfig, libidn-devel, zlib-devel
BuildRequires: nss-devel >= 3.11.7-7
-BuildRequires: krb5-devel
+BuildRequires: openldap-devel, krb5-devel
%description
cURL is a tool for getting files from HTTP, FTP, FILE, LDAP, LDAPS,
DICT, TELNET and TFTP servers, using any of the supported protocols.
cURL is designed to work without user interaction or any kind of
-interactivity. cURL offers many useful capabilities, like proxy
-support, user authentication, FTP upload, HTTP post, and file transfer
-resume.
+interactivity. cURL offers many useful capabilities, like proxy support,
+user authentication, FTP upload, HTTP post, and file transfer resume.
%package devel
Group: Development/Libraries
@@ -41,18 +39,20 @@
use cURL's capabilities internally.
%prep
-%setup -q
+%setup -q
%patch1 -p1 -b .multilib
%patch2 -p1 -b .privlibs
-%patch3 -p1 -b .curl-config
-%patch4 -p1 -b .sslgen
-%patch5 -p1 -b .badsocket
+%patch3 -p1 -b .badsocket
+%patch4 -p1 -b .nssproxy
+
+# Convert docs to UTF-8
+for f in CHANGES README; do
+ iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
+ mv -f ${f}.utf8 ${f}
+done
%build
-if pkg-config nss ; then
- CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
- LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
-fi
+export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
--with-gssapi=%{_prefix}/kerberos --with-libidn \
@@ -62,7 +62,12 @@
--disable-static
sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
Makefile libcurl.pc
-make CFLAGS="$RPM_OPT_FLAGS -DHAVE_PK11_CREATEGENERICOBJECT" %{?_smp_mflags}
+# Remove bogus rpath
+sed -i \
+ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -93,12 +98,11 @@
%{_bindir}/curl
%{_mandir}/man1/curl.1*
%{_libdir}/libcurl.so.*
-#%{_datadir}/ssl/certs/ca-bundle.crt
%files devel
%defattr(-,root,root)
%doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS
-%doc docs/CONTRIBUTE
+%doc docs/CONTRIBUTE docs/libcurl/ABI
%{_bindir}/curl-config*
%{_includedir}/curl
%{_libdir}/*.so
@@ -108,10 +112,21 @@
%{_datadir}/aclocal/libcurl.m4
%changelog
-* Mon Apr 14 2008 Jindrich Novy <jnovy at redhat.com> 7.17.1-3
+* Thu Jun 19 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-1
+- update to 7.18.2 (fixes #397911)
+- fix curl_multi_perform() over a proxy (#450140), thanks to
+ Rob Crittenden
+- spec cleanup, thanks to Paul Howarth (#225671)
+ - drop BR: libtool
+ - convert CHANGES and README to UTF-8
+ - _GNU_SOURCE in CFLAGS is no more needed
+ - remove bogus rpath
+- add ABI docs for libcurl
+- drop curl-config patch, obsoleted by @SSL_ENABLED@ autoconf
+ substitution (#432667)
+- drop sslgen patch -> applied upstream
- add BuildRequires krb5-devel to build curl with GSSAPI
negotiate support (#442069)
-- fix typo in package description
* Tue Jan 22 2008 Jindrich Novy <jnovy at redhat.com> 7.17.1-2
- do not attempt to close a bad socket (#427966),
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/F-8/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 18 Nov 2007 16:57:00 -0000 1.28
+++ sources 19 Jun 2008 05:33:25 -0000 1.29
@@ -1 +1 @@
-1fa635d1dfde8337c98c82749d75c1de curl-7.17.1.tar.bz2
+c389be5b0525276e58865956b7465562 curl-7.18.2.tar.bz2
More information about the fedora-extras-commits
mailing list