pidgin: 947bfbea: Ensure predictable use of SSL libs in RP...

[nosnilmot at pidgin.im]

----------------------------------------------------------------------
Revision: 947bfbeaa5e5a82ae69f2f3d36e34af9c15e24df
Parent:   c1054828ce4f0758061a1f055b1df298fc9e7047
Author:   nosnilmot at pidgin.im
Date:     09/01/10 13:55:14
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/947bfbeaa5e5a82ae69f2f3d36e34af9c15e24df

Changelog: 

Ensure predictable use of SSL libs in RPMs (GnuTLS for SuSE, NSS for
everyone else)

Changes against parent c1054828ce4f0758061a1f055b1df298fc9e7047

  patched  pidgin.spec.in

-------------- next part --------------
============================================================
--- pidgin.spec.in	126eb8ab0c3700ac9c447484383da882884c6a6c
+++ pidgin.spec.in	cf34b6914f0afc816b638c3cdddf88bb2e04521c
@@ -46,12 +46,14 @@ BuildRequires: gnutls-devel
 %if "%{_vendor}" == "suse"
 # For SuSE:
 BuildRequires: gnutls-devel
+%define sslopts "--enable-gnutls=yes --enable-nss=no"
 %{?_with_dbus:BuildRequires: dbus-1-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer010-devel >= 0.10}
 Requires(pre): gconf2
 Requires(post): gconf2
 Requires(preun): gconf2
 %else
+%define sslopts "--enable-gnutls=no --enable-nss=yes"
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
 Requires(pre): GConf2
@@ -230,6 +232,7 @@ CFLAGS="$RPM_OPT_FLAGS" ./configure --pr
                                     --mandir=%{_mandir} \
                                     --sysconfdir=%{_sysconfdir} \
                                     --disable-schemas-install \
+                                    %{sslopts} \
                                     %{!?_with_vv:--disable-vv} \
                                     %{!?_with_dbus:--disable-dbus} \
                                     %{!?_with_avahi:--disable-avahi} \
@@ -471,6 +474,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 01 2010 Stu Tomlinson <stu at nosnilmot.com>
+- Ensure predictable use of SSL libs
+
 * Wed Jun 02 2010 Stu Tomlinson <stu at nosnilmot.com>
 - add an option to build RPMs using --enable-trayicon-compat
   (--with trayiconcompat)