- update to 7.14.1

This commit is contained in:
Ivana Varekova 2005-10-13 08:38:18 +00:00
parent 727df8abca
commit 6e0b53dcdd
4 changed files with 41 additions and 7 deletions

View File

@ -1 +1 @@
curl-7.14.0.tar.bz2
curl-7.14.1.tar.bz2

33
curl-7.14.1-nousr.patch Normal file
View File

@ -0,0 +1,33 @@
--- curl-7.14.1/configure.ac.orig 2005-09-01 22:29:20.000000000 +0200
+++ curl-7.14.1/configure.ac 2005-10-13 09:55:19.395539032 +0200
@@ -813,7 +813,7 @@
PKGTEST="no"
PREFIX_OPENSSL=$OPT_SSL
LIB_OPENSSL="$PREFIX_OPENSSL/lib$libsuff"
- LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
+ #LDFLAGS="$LDFLAGS -L$LIB_OPENSSL"
CPPFLAGS="$CPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
;;
esac
@@ -867,7 +867,7 @@
HAVECRYPTO="yes"
LIBS="-lcrypto $LIBS"
],[
- LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
+ LDFLAGS="$CLEANLDFLAGS"
CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
AC_CHECK_LIB(crypto, CRYPTO_add_lock,[
HAVECRYPTO="yes"
--- curl-7.14.1/lib/Makefile.am.orig 2005-03-31 09:02:03.000000000 +0200
+++ curl-7.14.1/lib/Makefile.am 2005-10-13 09:51:55.244574696 +0200
@@ -107,8 +107,8 @@
install-data-hook:
@if test -n "@CURL_CA_BUNDLE@"; then \
- $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
- @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
+ $(mkinstalldirs) `dirname $(prefix)/../@CURL_CA_BUNDLE@`; \
+ @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(prefix)/../@CURL_CA_BUNDLE@; \
fi
# this hook is mainly for non-unix systems to build even if configure

View File

@ -1,12 +1,11 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
Name: curl
Version: 7.14.0
Version: 7.14.1
Release: 1
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
Patch0: curl-7.12.0-nousr.patch
Patch1: curl-7.10.4-path.patch
Patch0: curl-7.14.1-nousr.patch
URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
@ -34,8 +33,7 @@ use cURL's capabilities internally.
rm -rf $RPM_BUILD_ROOT
%setup -q
%patch0 -p1
%patch1 -p1
%patch0 -p1 -b .nousr
%build
aclocal
@ -90,6 +88,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
* Thu Oct 13 2005 Ivana Varekova <varekova@redhat.com> 7.14.1-1
- update to 7.14.1
* Thu Jun 16 2005 Ivana Varekova <varekova@redhat.com> 7.14.0-1
- rebuild new version

View File

@ -1 +1 @@
46ce665e47d37fce1a0bad935cce58a9 curl-7.14.0.tar.bz2
8b8723f3c0e7acfb30c5215e6cffde32 curl-7.14.1.tar.bz2