Mercurial > pidgin.yaz

changeset 30911:75460aee9279

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Ensure predictable use of SSL libs in RPMs (GnuTLS for SuSE, NSS for everyone else)
author Stu Tomlinson <stu@nosnilmot.com>
date Wed, 01 Sep 2010 17:55:14 +0000
parents 89311d2cfce9
children f3bc8afc0944 d0965a30216a 356a8d472395 fc961dfd4122
files pidgin.spec.in
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin.spec.in	Tue Aug 31 20:49:53 2010 +0000
+++ b/pidgin.spec.in	Wed Sep 01 17:55:14 2010 +0000
@@ -46,12 +46,14 @@
 %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 @@
                                     --mandir=%{_mandir} \
                                     --sysconfdir=%{_sysconfdir} \
                                     --disable-schemas-install \
+                                    %{sslopts} \
                                     %{!?_with_vv:--disable-vv} \
                                     %{!?_with_dbus:--disable-dbus} \
                                     %{!?_with_avahi:--disable-avahi} \
@@ -471,6 +474,9 @@
 %endif
 
 %changelog
+* Wed Sep 01 2010 Stu Tomlinson <stu@nosnilmot.com>
+- Ensure predictable use of SSL libs
+
 * Wed Jun 02 2010 Stu Tomlinson <stu@nosnilmot.com>
 - add an option to build RPMs using --enable-trayicon-compat
   (--with trayiconcompat)