dependencies/curl/curl.spec.patch

   1 --- curl.spec.orig      2010-04-29 14:19:36.962993346 -0400
   2 +++ curl.spec   2010-04-29 15:46:26.500737782 -0400
   3 @@ -1,10 +1,10 @@
   4  Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
   5 -Name: curl
   6 +Name: curl-openssl
   7  Version: 7.20.1
   8 -Release: 4%{?dist}
   9 +Release: 5%{?dist}
  10  License: MIT
  11  Group: Applications/Internet
  12 -Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
  13 +Source: http://curl.haxx.se/download/curl-%{version}.tar.lzma
  14  Source2: curlbuild.h
  15
  16  # upstream commit e32fe30d0cf7c1f7045ac0bd29322e7fb4feb5c8
  17 @@ -40,17 +40,20 @@
  18  Patch107: curl-7.20.0-disable-test1112.patch
  19
  20  Provides: webclient
  21 +Provides: curl = %{version}-%{release}
  22 +Obsoletes: curl
  23  URL: http://curl.haxx.se/
  24 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  25 +BuildRoot: %{_tmppath}/curl-%{version}-%{release}-root-%(%{__id_u} -n)
  26  BuildRequires: automake
  27  BuildRequires: groff
  28  BuildRequires: krb5-devel
  29  BuildRequires: libidn-devel
  30 -BuildRequires: libssh2-devel
  31 -BuildRequires: nss-devel
  32 +#BuildRequires: libssh2-devel
  33 +#BuildRequires: nss-devel
  34 +BuildRequires: openssl-devel
  35  BuildRequires: openldap-devel
  36 -BuildRequires: openssh-clients
  37 -BuildRequires: openssh-server
  38 +#BuildRequires: openssh-clients
  39 +#BuildRequires: openssh-server
  40  BuildRequires: pkgconfig
  41  BuildRequires: stunnel
  42
  43 @@ -60,7 +63,7 @@
  44  %endif
  45
  46  BuildRequires: zlib-devel
  47 -Requires: libcurl = %{version}-%{release}
  48 +Requires: libcurl-openssl = %{version}-%{release}
  49
  50  # TODO: mention also IMAP(S), POP3(S), SMTP(S) and RTSP protocols
  51  %description
  52 @@ -70,32 +73,36 @@
  53  interactivity. cURL offers many useful capabilities, like proxy support,
  54  user authentication, FTP upload, HTTP post, and file transfer resume.
  55
  56 -%package -n libcurl
  57 +%package -n libcurl-openssl
  58  Summary: A library for getting files from web servers
  59  Group: Development/Libraries
  60 +Provides: libcurl = %{version}-%{release}
  61 +Obsoletes: libcurl
  62
  63 -%description -n libcurl
  64 +%description -n libcurl-openssl
  65  This package provides a way for applications to use FTP, HTTP, Gopher and
  66  other servers for getting files.
  67
  68 -%package -n libcurl-devel
  69 +%package -n libcurl-openssl-devel
  70  Summary: Files needed for building applications with libcurl
  71  Group: Development/Libraries
  72  Requires: automake
  73 -Requires: libcurl = %{version}-%{release}
  74 +Requires: libcurl-openssl = %{version}-%{release}
  75  Requires: pkgconfig
  76
  77  Provides: curl-devel = %{version}-%{release}
  78  Obsoletes: curl-devel < %{version}-%{release}
  79 +Provides: libcurl-devel = %{version}-%{release}
  80 +Obsoletes: libcurl-devel
  81
  82 -%description -n libcurl-devel
  83 +%description -n libcurl-openssl-devel
  84  cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
  85  Dict servers, using any of the supported protocols. The libcurl-devel
  86  package includes files needed for developing applications which can
  87  use cURL's capabilities internally.
  88
  89  %prep
  90 -%setup -q
  91 +%setup -q -n curl-%{version}
  92
  93  # Convert docs to UTF-8
  94  # NOTE: we do this _before_ applying of all patches, which are already UTF-8
  95 @@ -134,10 +141,11 @@
  96      --enable-ldaps \
  97      --enable-manual \
  98      --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
  99 -    --with-gssapi \
 100 +    --with-gssapi=/usr/kerberos \
 101      --with-libidn \
 102 -    --with-libssh2 \
 103 -    --without-ssl --with-nss
 104 +    --with-ssl --without-nss
 105 +#    --with-libssh2 \
 106 +#    --without-ssl --with-nss
 107
 108  # uncomment to turn off optimizations
 109  # find -name Makefile | xargs sed -i 's/-O2/-O0/'
 110 @@ -189,9 +197,9 @@
 111  %clean
 112  rm -rf $RPM_BUILD_ROOT
 113
 114 -%post -n libcurl -p /sbin/ldconfig
 115 +%post -n libcurl-openssl -p /sbin/ldconfig
 116
 117 -%postun -n libcurl -p /sbin/ldconfig
 118 +%postun -n libcurl-openssl -p /sbin/ldconfig
 119
 120  %files
 121  %defattr(-,root,root,-)
 122 @@ -202,11 +210,11 @@
 123  %{_bindir}/curl
 124  %{_mandir}/man1/curl.1*
 125
 126 -%files -n libcurl
 127 +%files -n libcurl-openssl
 128  %defattr(-,root,root,-)
 129  %{_libdir}/libcurl.so.*
 130
 131 -%files -n libcurl-devel
 132 +%files -n libcurl-openssl-devel
 133  %defattr(-,root,root,-)
 134  %doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS
 135  %doc docs/CONTRIBUTE docs/libcurl/ABI
 136 @@ -219,6 +227,9 @@
 137  %{_datadir}/aclocal/libcurl.m4
 138
 139  %changelog
 140 +* Thu Apr 29 2010 Scott Cantor <cantor.2@osu.edu> 7.20.1-5
 141 +- rename packages to obsolete non-openssl version on RH6
 142 +
 143  * Sat Apr 24 2010 Kamil Dudka <kdudka@redhat.com> 7.20.1-4
 144  - upstream patch preventing failure of test536 with threaded DNS resolver
 145  - upstream patch preventing SSL handshake timeout underflow