- rel 2

- s/heimdal/krb5/
- removed obsolete heimdal patch

Changed files:
    curl.spec -> 1.128

diff --git a/curl.spec b/curl.spec
index 149512bfc82692cc868fb051b788e4910e3e02c5..b3fd388181501f95b9e12237e27d11c37843dd74 100644 (file)
--- a/curl.spec
+++ b/curl.spec
@@ -3,7 +3,7 @@
 %bcond_with    ares    # with c-ares (asynchronous DNS operations) library (disables IPv6)
 %bcond_without ssh     # without SSH support
 %bcond_without ssl     # without SSL support
-%bcond_without heimdal # without HEIMDAL support
+%bcond_without krb5    # without MIT Kerberos 5 support
 #
 Summary:       A utility for getting files from remote servers (FTP, HTTP, and others)
 Summary(es.UTF-8):     Un cliente para bajar archivos de servidores (FTP, HTTP, y otros)
@@ -13,19 +13,18 @@ Summary(ru.UTF-8):  Утилита для получения файлов с се
 Summary(uk.UTF-8):     Утиліта для отримання файлів з серверів FTP, HTTP та інших
 Name:          curl
 Version:       7.16.1
-Release:       1
+Release:       2
 License:       MIT-like
 Group:         Applications/Networking
 Source0:       http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
 # Source0-md5: acdab0b0467c55e10ed02d2afed80575
 Patch0:                %{name}-no_strip.patch
 Patch1:                %{name}-ac.patch
-Patch2:                %{name}-heimdal.patch
 URL:           http://curl.haxx.se/
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake
 %{?with_ares:BuildRequires:    c-ares-devel}
-%{?with_heimdal:BuildRequires: heimdal-devel >= 0.7}
+%{?with_krb5:BuildRequires:    krb5-devel}
 BuildRequires: libidn-devel >= 0.4.1
 %{?with_ssh:BuildRequires:     libssh2-devel}
 BuildRequires: libtool
@@ -106,7 +105,7 @@ Summary(uk.UTF-8):  Файли для розробки з використанн
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
 %{?with_ares:Requires: c-ares-devel}
-%{?with_heimdal:Requires:      heimdal-devel}
+%{?with_krb5:Requires: krb5-devel}
 Requires:      libidn-devel >= 0.4.1
 %{?with_ssl:Requires:  openssl-devel >= 0.9.7c}
 Requires:      zlib-devel
@@ -159,7 +158,6 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%{?with_heimdal:%patch2 -p0}
 
 %build
 %{__libtoolize}
@@ -170,7 +168,7 @@ Bibliotecas estáticas para desenvolvimento com o curl.
 %configure \
        %{?with_ssl:--with-ssl=%{_prefix}} \
        %{?with_ssl:--with-ca-bundle=/usr/share/ssl/ca-bundle.crt} \
-       %{?with_heimdal:--with-gssapi=%{_prefix}} \
+       %{?with_krb5:--with-gssapi=%{_prefix}} \
        %{?with_ares:--enable-ares=%{_prefix}} \
        --%{?with_ares:dis}%{!?with_ares:en}able-ipv6