rpms/pidgin/devel pidgin.spec,1.104,1.105

Warren Togami 砥上勇 wtogami at fedoraproject.org
Tue Dec 8 17:29:39 UTC 2009


Author: wtogami

Update of /cvs/pkgs/rpms/pidgin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20695

Modified Files:
	pidgin.spec 
Log Message:
temporarily disable evolution integration in F13 until it is fixed



Index: pidgin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pidgin/devel/pidgin.spec,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -p -r1.104 -r1.105
--- pidgin.spec	7 Dec 2009 03:06:47 -0000	1.104
+++ pidgin.spec	8 Dec 2009 17:29:38 -0000	1.105
@@ -37,6 +37,7 @@
 %define vv_support		0
 %define libidn_support		0
 %define disable_silc		0
+%define disable_evolution       0
 
 # RHEL4: Use ALSA aplay to output sounds because it lacks gstreamer
 %if 0%{?fedora} < 5
@@ -89,10 +90,15 @@
 %if 0%{?rhel} == 6
 %define disable_silc	1
 %endif
+# F13+: Temporarily disable evolution integration until it becomes fixed
+# http://developer.pidgin.im/ticket/10852
+%if 0%{?fedora} >= 13
+%define disable_evolution 1
+%endif
 
 Name:		pidgin
 Version:	2.6.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 License:        GPLv2+ and GPLv2 and MIT
 # GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
 # GPLv2 - silc & novell prpls
@@ -170,7 +176,9 @@ BuildRequires:	krb5-devel
 # gtkspell integration (FC1+)
 BuildRequires:	gtkspell-devel
 # Evolution integration (FC3+)
+%if ! %{disable_evolution}
 BuildRequires:	evolution-data-server-devel
+%endif
 # SILC integration (FC3+)
 %if ! %{disable_silc}
 BuildRequires:	libsilc-devel
@@ -403,7 +411,11 @@ SWITCHES="--with-extraversion=%{release}
 	SWITCHES="$SWITCHES --with-krb4"
 %endif
 	SWITCHES="$SWITCHES --enable-perl"
+%if ! %{disable_evolution}
 	SWITCHES="$SWITCHES --enable-gevolution"
+%else
+	SWITCHES="$SWITCHES --disable-gevolution"
+%endif
 %if %{dbus_integration}
 	SWITCHES="$SWITCHES --enable-dbus"
 %else
@@ -631,6 +643,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Dec  8 2009 Warren Togami <wtogami at redhat.com> - 2.6.4-4
+- temporarily disable evolution integration in F13 until it is fixed
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.6.4-3
 - rebuild against perl 5.10.1
 




More information about the scm-commits mailing list