packages: curl/curl.spec - disable ares,gnutls,rtmp for ac

[glen]

Author: glen                         Date: Sun Nov  6 12:15:45 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable ares,gnutls,rtmp for ac

---- Files affected:
packages/curl:
   curl.spec (1.198 -> 1.199) 

---- Diffs:

================================================================
Index: packages/curl/curl.spec
diff -u packages/curl/curl.spec:1.198 packages/curl/curl.spec:1.199
--- packages/curl/curl.spec:1.198	Sun Nov  6 13:09:51 2011
+++ packages/curl/curl.spec	Sun Nov  6 13:15:40 2011
@@ -1,14 +1,20 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	ares		# with c-ares (asynchronous DNS operations) library
 %bcond_without	ssh		# without SSH support
 %bcond_without	ssl		# without SSL support
-%bcond_without	gnutls		# use GnuTLS instead of OpenSSL
 %bcond_without	kerberos5	# without Heimdal Kerberos 5 support
-%bcond_without	rtmp		# without Real Time Media Protocol
 %bcond_without	ldap		# without LDAP support
-#
+%if "%{pld_release}" != "ac"
+%bcond_without	ares		# with c-ares (asynchronous DNS operations) library
+%bcond_without	gnutls		# use GnuTLS instead of OpenSSL
+%bcond_without	rtmp		# without Real Time Media Protocol
+%else
+%bcond_with	ares		# with c-ares (asynchronous DNS operations) library
+%bcond_with	gnutls		# use GnuTLS instead of OpenSSL
+%bcond_with	rtmp		# without Real Time Media Protocol
+%endif
+
 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)
 Summary(pl.UTF-8):	Narzędzie do ściągania plików z serwerów (FTP, HTTP i innych)
@@ -26,7 +32,7 @@
 Patch1:		%{name}-ac.patch
 Patch2:		%{name}-pc.patch
 Patch3:		%{name}-krb5flags.patch
-Patch4:		libcurl.fb-changes.diff
+Patch4:		lib%{name}.fb-changes.diff
 URL:		http://curl.haxx.se/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -38,6 +44,8 @@
 BuildRequires:	libtool
 %{?with_ldap:BuildRequires:	openldap-devel}
 BuildRequires:	pkgconfig
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	rpmbuild(macros) >= 1.453
 %if %{with ssl}
 %if %{with gnutls}
 BuildRequires:	gnutls-devel
@@ -106,9 +114,9 @@
 Summary:	curl library
 Summary(pl.UTF-8):	Biblioteka curl
 Group:		Libraries
+%{?with_ares:Requires:	c-ares >= 1.7.0}
 Suggests:	ca-certificates
 Conflicts:	ca-certificates < 20080809-4
-%{?with_ares:Requires:	c-ares >= 1.7.0}
 
 %description libs
 curl library.
@@ -267,6 +275,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.199  2011/11/06 12:15:40  glen
+- disable ares,gnutls,rtmp for ac
+
 Revision 1.198  2011/11/06 12:09:51  glen
 - remove libtool m4, allows building with older libtool
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/curl/curl.spec?r1=1.198&r2=1.199&f=u