# HG changeset patch # User Stu Tomlinson # Date 1283363714 0 # Node ID 75460aee92796f0be15f203794dc8ba79135060f # Parent 89311d2cfce9a61ebd906814d4ff6f19a09cd22a Ensure predictable use of SSL libs in RPMs (GnuTLS for SuSE, NSS for everyone else) diff -r 89311d2cfce9 -r 75460aee9279 pidgin.spec.in --- 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 +- Ensure predictable use of SSL libs + * Wed Jun 02 2010 Stu Tomlinson - add an option to build RPMs using --enable-trayicon-compat (--with trayiconcompat)