Browse Source

curl: update to 7.34.0, add libcurl.m4 to devel package.

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8211 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 11 years ago
parent
commit
ce03193a6f
1 changed files with 8 additions and 12 deletions
  1. 8 12
      c/curl/curl-vl.spec

+ 8 - 12
c/curl/curl-vl.spec

@@ -3,7 +3,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
-Version: 7.32.0
+Version: 7.34.0
 Release: 1%{?_dist_release}
 
 License: MIT
@@ -12,12 +12,6 @@ URL: http://curl.haxx.se/
 
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 
-# make sure that NSS is initialized prior to calling PK11_GenerateRandom()
-Patch1: 0001-curl-7.32.0-204126a5.patch
-
-# avoid delay if FTP is aborted in CURLOPT_HEADERFUNCTION callback (#1005686)
-Patch2: 0002-curl-7.32.0-c639d725.patch
-
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -104,10 +98,6 @@ use cURL's capabilities internally.
 %prep
 %setup -q 
 
-# upstream patches
-%patch1 -p1
-%patch2 -p1
-
 # Fedora patches
 %patch101 -p1
 %patch102 -p1
@@ -129,7 +119,8 @@ use cURL's capabilities internally.
   --with-libssh2 \
 %endif
   --enable-ldaps \
-  --disable-static
+  --disable-static \
+  --enable-hidden-symbols
 
 make %{?_smp_mflags}
 
@@ -165,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 %{_mandir}/man1/curl-config.1*
 %{_mandir}/man3/*
+%{_datadir}/aclocal/libcurl.m4
 
 
 ## to build compat32 for x86_64 architecture support
@@ -180,6 +172,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sun Jan 19 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 7.34.0-1
+- new upstream release
+- add libcurl.m4 to -devel package
+
 * Wed Sep 25 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 7.32.0-1
 - new upstream release
 - import upstream/fedora patches