Accepting request 77837 from devel:libraries:c_c++

- remove support for old suse_versions

- Update to 7.21.7:
  - Fix libcurl inappropriate GSSAPI delegation. Full details at
    http://curl.haxx.se/docs/adv_20110623.html
  - Some other minor fixes.
- Use the lzma compressed tarball provided upstreams.

- remove unintented LDFLAGS from the spec file 

- Update to 7.21.6
* curl-config: fix --version 
* use HTTPS properly after CONNECT
* SFTP: close file before post quote operations

- bnc#598574 has been fixed in upstream commit  8ab137b2bc9630ce20f4
 already, so enable c-ares support again.

- Support openSSL compiled without SSLv2 support
- Update to version 7.21.4
  * SMTP: add brackets for MAIL FROM
  * multi: connect fail => use next IP address
  * pubkey_show: allocate buffer to fit any-size result
  * Curl_do: avoid using stale conn pointer
  * tftpd test server: avoid buffer overflow report from glibc
  * OpenSSL get_cert_chain: support larger data sets
  * SCP/SFTP transfers: acknowledge speedcheck
  * connect problem: use UDP correctly
  * OpenSSL: improved error message on SSL_CTX_new failures
  * HTTP: memory leak on multiple Location:

OBS-URL: https://build.opensuse.org/request/show/77837
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=59

_service

@@ -1,13 +0,0 @@
-<?xml version="1.0" ?>
-<services>
-  <service name="download_url">
-    <param name="protocol">http</param>
-    <param name="host">curl.haxx.se</param>
-    <param name="path">/download/curl-7.21.2.tar.bz2</param>
-  </service>
-  <service name="verify_file">
-    <param name="file">_service:download_url:curl-7.21.2.tar.bz2</param>
-    <param name="verifier">sha256</param>
-    <param name="checksum">f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21</param>
-  </service>
-</services>

_service:download_url:curl-7.21.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4a632e704f28767e6bbffcc6112db0590b1c9d50d8226d706ad39632355bf21
-size 2167919

curl-7.21.7.tar.lzma

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8b85e3eca6a57e5dcc11625bfbd1252fef65556e1a21556819de135dcf46befe
+size 1893556

curl.changes

@@ -1,4 +1,57 @@
 -------------------------------------------------------------------
+Tue Jul 12 06:46:02 UTC 2011 - coolo@novell.com
+
+- remove support for old suse_versions
+
+-------------------------------------------------------------------
+Mon Jul 11 11:40:17 CEST 2011 - pth@suse.de
+
+- Update to 7.21.7:
+  - Fix libcurl inappropriate GSSAPI delegation. Full details at
+    http://curl.haxx.se/docs/adv_20110623.html
+  - Some other minor fixes.
+
+- Use the lzma compressed tarball provided upstreams.
+
+-------------------------------------------------------------------
+Fri May 20 16:25:34 UTC 2011 - crrodriguez@opensuse.org
+
+- remove unintented LDFLAGS from the spec file 
+
+-------------------------------------------------------------------
+Fri May 20 15:37:54 UTC 2011 - crrodriguez@opensuse.org
+
+- Update to 7.21.6
+* curl-config: fix --version 
+* use HTTPS properly after CONNECT
+* SFTP: close file before post quote operations
+
+-------------------------------------------------------------------
+Thu Apr 14 17:02:19 UTC 2011 - crrodriguez@opensuse.org
+
+- bnc#598574 has been fixed in upstream commit  8ab137b2bc9630ce20f4
+ already, so enable c-ares support again.
+
+-------------------------------------------------------------------
+Sat Apr  9 20:42:27 UTC 2011 - crrodriguez@opensuse.org
+
+- Support openSSL compiled without SSLv2 support
+- Update to version 7.21.4
+  * SMTP: add brackets for MAIL FROM
+  * multi: connect fail => use next IP address
+  * pubkey_show: allocate buffer to fit any-size result
+  * Curl_do: avoid using stale conn pointer
+  * tftpd test server: avoid buffer overflow report from glibc
+  * OpenSSL get_cert_chain: support larger data sets
+  * SCP/SFTP transfers: acknowledge speedcheck
+  * connect problem: use UDP correctly
+  * OpenSSL: improved error message on SSL_CTX_new failures
+  * HTTP: memory leak on multiple Location:
+  * curl.1: typo in -v description
+  * CURLOPT_SOCKOPTFUNCTION: return proper error code --keepalive-time
+  * file: add support for CURLOPT_TIMECONDITION
+  * multi: fix CURLM_STATE_TOOFAST for multi_socket
+-------------------------------------------------------------------
 Fri Oct 22 16:37:03 UTC 2010 - cristian.rodriguez@opensuse.org
 
 - Update to version  7.21.2

curl.spec

@@ -22,25 +22,22 @@
 %bcond_without testsuite
 
 Name:           curl
-BuildRequires:  libidn-devel openldap2-devel pkg-config zlib-devel
+BuildRequires:  libidn-devel openldap2-devel pkg-config zlib-devel lzma
 %if %{with openssl}
 BuildRequires:  openssl-devel
 %endif
 %if %{with mozilla_nss}
 BuildRequires:  mozilla-nss-devel
 %endif
-%if 0%{suse_version} > 930
 BuildRequires:  krb5-devel
-%else
-BuildRequires:  heimdal-devel
-%endif
 BuildRequires:  libssh2-devel openssh
+BuildRequires:  libcares-devel
 %if 0%{?_with_stunnel:1}
 # used by the testsuite
 BuildRequires:  stunnel
 %endif
 #define cvs_suffix -20090302
-Version:        7.21.2
+Version:        7.21.7
 Release:        2
 AutoReqProv:    on
 # bug437293
@@ -52,7 +49,7 @@ License:        BSD3c(or similar) ; MIT License (or similar)
 Group:          Productivity/Networking/Web/Utilities
 Summary:        A Tool for Transferring Data from URLs
 Url:            http://curl.haxx.se/
-Source:         curl-%version%{?cvs_suffix}.tar.bz2
+Source:         curl-%version%{?cvs_suffix}.tar.lzma
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -93,7 +90,7 @@ user interaction or any kind of interactivity.
 # (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere,
 # will hopefully change in the future)
 sed -i 's/link_all_deplibs=unknown/link_all_deplibs=no/' configure
-export CFLAGS="$RPM_OPT_FLAGS"
+export CFLAGS="%{optflags}"
 ./configure \
 	--prefix=%{_prefix} \
 	--enable-ipv6 \
@@ -106,15 +103,13 @@ export CFLAGS="$RPM_OPT_FLAGS"
 	--with-nss \
 %endif
 %endif
-%if %suse_version > 930
 	--with-gssapi=/usr/lib/mit \
-%else
-	--with-gssapi=/usr/lib/heimdal \
-%endif
 	--with-libssh2\
 	--libdir=%{_libdir} \
 	--enable-hidden-symbols \
-	--disable-static
+	--disable-static \
+    --enable-ares
+
 : if this fails, the above sed hack did not work
 ./libtool --config | grep -q link_all_deplibs=no
 # enable-hidden-symbols needs gcc4 and causes that curl exports only its API
@@ -143,7 +138,7 @@ perl ./runtests.pl -a -b$base || {
 %endif
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir}
+%{makeinstall}
 rm $RPM_BUILD_ROOT%_libdir/libcurl.la
 install -d $RPM_BUILD_ROOT/usr/share/aclocal
 install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/usr/share/aclocal/