SPECS: pidgin.spec - added gnutls bcond (should be preferred?); fixes unfin...

[qboosh]

Author: qboosh                       Date: Thu Dec 25 11:42:39 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added gnutls bcond (should be preferred?); fixes unfinished files update

---- Files affected:
SPECS:
   pidgin.spec (1.224 -> 1.225) 

---- Diffs:

================================================================
Index: SPECS/pidgin.spec
diff -u SPECS/pidgin.spec:1.224 SPECS/pidgin.spec:1.225
--- SPECS/pidgin.spec:1.224	Mon Dec 22 23:04:32 2008
+++ SPECS/pidgin.spec	Thu Dec 25 12:42:33 2008
@@ -16,12 +16,13 @@
 %bcond_without	doc		# do not generate and include documentation
 %bcond_with	dotnet		# build with mono support
 %bcond_without	evolution	# compile without the Pidgin-Evolution plugin
+%bcond_with	gnutls		# use GnuTLS instead of NSS
 %bcond_without	gtkspell	# without gtkspell support
 %bcond_without	meanwhile	# without meanwhile support
 %bcond_without	sasl		# disable SASL support
 %bcond_without	text		# don't build text UI
 %bcond_without 	silc		# Build without SILC libraries
-%bcond_without 	nm			# NetworkManager support (requires D-Bus)
+%bcond_without 	nm		# NetworkManager support (requires D-Bus)
 
 %if %{without dbus}
 %undefine	with_nm
@@ -63,7 +64,7 @@
 %{?with_evolution:BuildRequires:	evolution-data-server-devel >= 1.8.1}
 BuildRequires:	gettext-autopoint
 BuildRequires:	gettext-devel
-BuildRequires:	gnutls-devel
+%{?with_gnutls:BuildRequires:	gnutls-devel}
 BuildRequires:	gstreamer-devel >= 0.10.10
 BuildRequires:	gtk+2-devel >= 2:2.10.6
 %{?with_gtkspell:BuildRequires:	gtkspell-devel >= 2.0.11}
@@ -75,6 +76,7 @@
 %{?with_dotnet:BuildRequires:	mono-csharp}
 %{?with_dotnet:BuildRequires:	mono-devel}
 %{?with_text:BuildRequires:	ncurses-ext-devel}
+%{!?with_gnutls:BuildRequires:	nss-devel}
 BuildRequires:	perl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	python-modules
@@ -257,9 +259,9 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--disable-gnutls \
+	%{!?with_gnutls:--disable-gnutls} \
+	%{?with_gnutls:--disable-nss} \
 	--disable-nas \
-	--enable-nss \
 	%{?with_doc:--enable-dot --enable-devhelp} \
 	--with-perl-lib=vendor \
 	%{!?with_silc:--with-silc-includes=not_existent_directory} \
@@ -377,8 +379,8 @@
 %attr(755,root,root) %{_libdir}/purple-2/newline.so
 %attr(755,root,root) %{_libdir}/purple-2/offlinemsg.so
 %attr(755,root,root) %{_libdir}/purple-2/psychic.so
-#%attr(755,root,root) %{_libdir}/purple-2/ssl-gnutls.so
-%attr(755,root,root) %{_libdir}/purple-2/ssl-nss.so
+%{?with_gnutls:%attr(755,root,root) %{_libdir}/purple-2/ssl-gnutls.so}
+%{!?with_gnutls:%attr(755,root,root) %{_libdir}/purple-2/ssl-nss.so}
 %attr(755,root,root) %{_libdir}/purple-2/ssl.so
 %attr(755,root,root) %{_libdir}/purple-2/statenotify.so
 %if %{with dbus}
@@ -475,6 +477,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.225  2008/12/25 11:42:33  qboosh
+- added gnutls bcond (should be preferred?); fixes unfinished files update
+
 Revision 1.224  2008/12/22 22:04:32  rotom
 - up to 2.5.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/pidgin.spec?r1=1.224&r2=1.225&f=u