diff pidgin.spec.in @ 23404:3c1f1bed5be2

merge of '57be04f07f9fdc005b620053ae4f09dd1e27ebb3' and '582755b8228024381c2a9e110de35f0aaedd5dc1'
author Evan Schoenberg <evan.s@dreskin.net>
date Wed, 02 Jul 2008 00:06:25 +0000
parents 19383e0bd143
children b025d3c9ceae
line wrap: on
line diff
--- a/pidgin.spec.in	Wed Jul 02 00:05:37 2008 +0000
+++ b/pidgin.spec.in	Wed Jul 02 00:06:25 2008 +0000
@@ -40,6 +40,8 @@
 %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h}
 %{!?_without_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
 %{!?_without_text:BuildRequires: ncurses-devel}
+%{!?_without_nm:BuildRequires: NetworkManager-devel}
+%{!?_without_gevolution:BuildRequires: evolution-data-server-devel}
 
 %if "%{_vendor}" == "suse"
 # For SuSE:
@@ -225,8 +227,12 @@
                                     --sysconfdir=%{_sysconfdir} \
                                     --disable-schemas-install \
                                     %{!?_with_dbus:--disable-dbus} \
+                                    %{!?_with_avahi:--disable-avahi} \
+                                    %{!?_with_meanwhile:--disable-meanwhile} \
                                     %{?_without_gstreamer:--disable-gstreamer} \
                                     %{?_without_gtkspell:--disable-gtkspell} \
+                                    %{?_without_nm:--disable-nm} \
+                                    %{!?_without_gevolution:--enable-gevolution} \
                                     %{?_with_mono:--enable-mono} \
                                     %{?_with_perlmakehack:--with-perl-lib=%{buildroot}%{_prefix}} \
                                     %{!?_with_perlmakehack:--with-perl-lib=%{_prefix}} \
@@ -468,6 +474,12 @@
 %endif
 
 %changelog
+* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com>
+- Fix building without meanwhile support
+
+* Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com>
+- Add "--without nm" support to build without NetworkManager
+
 * Thu Feb 28 2008 Stu Tomlinson <stu@nosnilmot.com>
 - Remove --with-howl options as we no longer support using howl for bonjour