SPECS: pidgin.spec - unified sasl bcond name

qboosh qboosh at pld-linux.org
Sat May 19 22:24:59 CEST 2007


Author: qboosh                       Date: Sat May 19 20:24:59 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified sasl bcond name

---- Files affected:
SPECS:
   pidgin.spec (1.172 -> 1.173) 

---- Diffs:

================================================================
Index: SPECS/pidgin.spec
diff -u SPECS/pidgin.spec:1.172 SPECS/pidgin.spec:1.173
--- SPECS/pidgin.spec:1.172	Sat May 19 22:06:31 2007
+++ SPECS/pidgin.spec	Sat May 19 22:24:53 2007
@@ -10,13 +10,13 @@
 # - move mono related files to -libs?
 #
 %bcond_without	cap		# without Contact Availability Prediction
-%bcond_without	cyrus_sasl	# disable Cyrus SASL support
 %bcond_without	dbus		# without dbus (for pidgin-remote and others)
 %bcond_without	doc		# do not generate and include documentation
+%bcond_without	dotnet		# build with mono support
 %bcond_without	evolution	# compile without the Pidgin-Evolution plugin
 %bcond_without	gtkspell	# without gtkspell support
 %bcond_without	meanwhile	# without meanwhile support
-%bcond_without	dotnet		# build with mono support
+%bcond_without	sasl		# disable SASL support
 %bcond_without	text		# don't build text UI
 %bcond_with 	silc		# Build with SILC libraries
 #
@@ -44,7 +44,7 @@
 BuildRequires:	automake
 BuildRequires:	avahi-compat-howl-devel
 BuildRequires:	bind-devel
-%{?with_cyrus_sasl:BuildRequires:	cyrus-sasl-devel}
+%{?with_sasl:BuildRequires:	cyrus-sasl-devel}
 %{?with_dbus:BuildRequires:	dbus-glib-devel >= 0.71}
 %{?with_evolution:BuildRequires:	evolution-data-server-devel >= 1.8.1}
 BuildRequires:	gettext-autopoint
@@ -232,7 +232,7 @@
 	--with-silc-includes=%{?with_silc:yes}%{!?with_silc:no} \
 	--with-silc-libs=%{?with_silc:yes}%{!?with_silc:no} \
 	--%{?with_cap:en}%{!?with_cap:dis}able-cap \
-	%{?with_cyrus_sasl:--enable-cyrus-sasl} \
+	%{?with_sasl:--enable-cyrus-sasl} \
 	%{?with_dbus:--enable-dbus --with-dbus-session-dir=/usr/share/dbus-1/services} \
 	%{!?with_dbus:--disable-dbus} \
 	%{!?with_evolution:--disable-gevolution} \
@@ -435,6 +435,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.173  2007/05/19 20:24:53  qboosh
+- unified sasl bcond name
+
 Revision 1.172  2007/05/19 20:06:31  deejay1
 - added additional bconds
 - use avahi for zeroconf
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/pidgin.spec?r1=1.172&r2=1.173&f=u



More information about the pld-cvs-commit mailing list