rpms/telepathy-haze/F-11 telepathy-haze.spec,1.16,1.17

[Peter Gordon]

Author: pgordon

Update of /cvs/pkgs/rpms/telepathy-haze/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19722

Modified Files:
	telepathy-haze.spec 
Log Message:
Fedora 11 doesn't need the no-yahoo-japan patch, since it still has Pidgin 2.5.x


Index: telepathy-haze.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telepathy-haze/F-11/telepathy-haze.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- telepathy-haze.spec	14 Aug 2009 05:27:28 -0000	1.16
+++ telepathy-haze.spec	15 Aug 2009 23:39:47 -0000	1.17
@@ -1,6 +1,6 @@
 Name:		telepathy-haze
 Version:	0.3.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	A multi-protocol Libpurple connection manager for Telepathy
 
 Group:		Applications/Communications
@@ -10,8 +10,9 @@ URL:		http://developer.pidgin.im/wiki/Te
 Source0:	http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.gz
 
 ## Remove Yahoo Japan options from haze.manager, to fix Yahoo! IM connectivity
-## issues. (Fedora bug #514998, GNOME Bug #591381)
-Patch0: 	%{name}-no-yahoo-japan.patch
+## issues. (Fedora bug #514998, GNOME Bug #591381) - only needed with Pidgin
+## 2.6.0+, so not yet included in Fedora 11's package.
+# Patch0: 	%{name}-no-yahoo-japan.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,7 +31,7 @@ others will probably work too.
 
 %prep
 %setup -q
-%patch0 -p1 -b .no-yahoo-japan
+#patch0 -p1 -b .no-yahoo-japan
 
 
 %build
@@ -56,6 +57,10 @@ rm -rf %{buildroot}
 %{_mandir}/man8/telepathy-haze.8*
 
 %changelog
+* Sat Aug 15 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-2
+- Don't include the Yahoo! Japan patch just yet. It's only for Pidgin
+  (libpurple) 2.6.0+. 
+
 * Thu Aug 13 2009 Peter Gordon <peter at thecodergeek.com> - 0.3.1-1
 - Update to new upstream release (0.3.1).
 - Add upstream patch to remove the Yahoo! Japan from the manager profile,