rpms/curl/devel .cvsignore, 1.29, 1.30 curl-7.15.3-multilib.patch, 1.3, 1.4 curl.spec, 1.72, 1.73 sources, 1.29, 1.30 curl-7.16.4-curl-config.patch, 1.2, NONE

Jindrich Novy (jnovy) fedora-extras-commits at redhat.com
Mon Mar 31 07:48:35 UTC 2008


Author: jnovy

Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5240

Modified Files:
	.cvsignore curl-7.15.3-multilib.patch curl.spec sources 
Removed Files:
	curl-7.16.4-curl-config.patch 
Log Message:
* Mon Mar 31 2008 Jindrich Novy <jnovy at redhat.com> 7.18.1-1
- update to curl 7.18.1 (fixes #397911)
- add ABI docs for libcurl
- remove --static-libs from curl-config
- drop curl-config patch, obsoleted by @SSL_ENABLED@ autoconf
  substitution (#432667)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore	28 Jan 2008 21:00:10 -0000	1.29
+++ .cvsignore	31 Mar 2008 07:47:59 -0000	1.30
@@ -1 +1 @@
-curl-7.18.0.tar.bz2
+curl-7.18.1.tar.bz2

curl-7.15.3-multilib.patch:

Index: curl-7.15.3-multilib.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl-7.15.3-multilib.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- curl-7.15.3-multilib.patch	28 Jan 2008 21:00:10 -0000	1.3
+++ curl-7.15.3-multilib.patch	31 Mar 2008 07:47:59 -0000	1.4
@@ -1,7 +1,15 @@
 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-01-28 21:37:50.000000000 +0100
-@@ -72,7 +72,7 @@
++++ 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)
@@ -10,7 +18,7 @@
  	;;
  
      --prefix)
-@@ -189,16 +189,7 @@
+@@ -189,20 +188,7 @@
         	;;
  
      --libs)
@@ -24,7 +32,11 @@
 -	else
 -	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
 -	fi
+-	;;
+-
+-    --static-libs)
+-	echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
 +	pkg-config libcurl --libs
  	;;
  
-     --static-libs)
+     *)


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- curl.spec	15 Feb 2008 12:11:30 -0000	1.72
+++ curl.spec	31 Mar 2008 07:47:59 -0000	1.73
@@ -1,21 +1,20 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
-Name: curl 
+Name: curl
 Version: 7.18.0
-Release: 2%{?dist}
+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-badsocket.patch
+Patch3: curl-7.17.1-badsocket.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: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
 
-%description  
+%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
@@ -45,11 +44,10 @@
 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 .badsocket
+%patch3 -p1 -b .badsocket
 
 %build
 export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT -D_GNU_SOURCE=1"
@@ -96,7 +94,7 @@
 %files -n libcurl-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
@@ -106,6 +104,13 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Mar 31 2008 Jindrich Novy <jnovy at redhat.com> 7.18.1-1
+- update to curl 7.18.1 (fixes #397911)
+- add ABI docs for libcurl
+- remove --static-libs from curl-config
+- drop curl-config patch, obsoleted by @SSL_ENABLED@ autoconf
+  substitution (#432667)
+
 * Fri Feb 15 2008 Jindrich Novy <jnovy at redhat.com> 7.18.0-2
 - define _GNU_SOURCE so that NI_MAXHOST gets defined from glibc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	28 Jan 2008 21:00:10 -0000	1.29
+++ sources	31 Mar 2008 07:47:59 -0000	1.30
@@ -1 +1 @@
-3e50dd887d6a354be312d874e1d3426c  curl-7.18.0.tar.bz2
+805834fc1136ff7600d2179bc0386c5a  curl-7.18.1.tar.bz2


--- curl-7.16.4-curl-config.patch DELETED ---




More information about the fedora-extras-commits mailing list