[gnome-pilot/f15/master] Update to 2.91.92

[Matthew Barnes]

commit 764c0fa98164d5c3c0a0b733c691eef39da02550
Author: Matthew Barnes <mbarnes at redhat.com>
Date:   Mon Mar 21 17:42:06 2011 -0400

    Update to 2.91.92

 .gitignore                               |    1 +
 gnome-pilot-2.0.17-fix-conduit-dir.patch |    4 ++--
 gnome-pilot.spec                         |   14 +++++++++-----
 sources                                  |    2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 611d843..1cc7536 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 gnome-pilot-2.0.17.tar.bz2
 /gnome-pilot-2.32.0.tar.bz2
+/gnome-pilot-2.91.92.tar.bz2
diff --git a/gnome-pilot-2.0.17-fix-conduit-dir.patch b/gnome-pilot-2.0.17-fix-conduit-dir.patch
index 976608e..5b02034 100644
--- a/gnome-pilot-2.0.17-fix-conduit-dir.patch
+++ b/gnome-pilot-2.0.17-fix-conduit-dir.patch
@@ -7,7 +7,7 @@ diff -up gnome-pilot-2.32.0/gpilotd/Makefile.am.fix-conduit-dir gnome-pilot-2.32
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
 -	-DCONDUITDIR=\"$(datadir)\"				\
 +	-DCONDUITDIR=\"$(libdir)\"				\
- 	$(HAL_CFLAGS)						\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE			\
  	$(GNOME_PILOT_CFLAGS)	
  
 diff -up gnome-pilot-2.32.0/gpilotd/Makefile.in.fix-conduit-dir gnome-pilot-2.32.0/gpilotd/Makefile.in
@@ -19,6 +19,6 @@ diff -up gnome-pilot-2.32.0/gpilotd/Makefile.in.fix-conduit-dir gnome-pilot-2.32
  	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 		\
 -	-DCONDUITDIR=\"$(datadir)\"				\
 +	-DCONDUITDIR=\"$(libdir)\"				\
- 	$(HAL_CFLAGS)						\
+	-DG_UDEV_API_IS_SUBJECT_TO_CHANGE			\
  	$(GNOME_PILOT_CFLAGS)	
  
diff --git a/gnome-pilot.spec b/gnome-pilot.spec
index 4c2af2c..184913a 100644
--- a/gnome-pilot.spec
+++ b/gnome-pilot.spec
@@ -1,11 +1,11 @@
 # Disable E-D-S conduits until gnome-pilot is ported to gtk+-3.0.
-%define build_eds_conduits 0
+%define build_eds_conduits 1
 
 ### Abstract ###
 
 Name: gnome-pilot
-Version: 2.32.0
-Release: 8%{?dist}
+Version: 2.91.92
+Release: 1%{?dist}
 License: LGPLv2+ and GPLv2+
 Group: Applications/Communications
 Summary: GNOME pilot programs
@@ -20,7 +20,7 @@ ExcludeArch: s390 s390x
 Patch1: gnome-pilot-2.0.17-fix-conduit-dir.patch
 
 # Disable the panel applet for GNOME 3.
-Patch2: gnome-pilot-2.32.0-disable-applet.patch
+#Patch2: gnome-pilot-2.32.0-disable-applet.patch
 
 ### Dependencies ###
 
@@ -79,7 +79,7 @@ PalmOS<tm> devices with Evolution-Data-Server.
 %prep
 %setup -q
 %patch1 -p1 -b .fix-conduit-dir
-%patch2 -p1 -b .disable-applet
+#%patch2 -p1 -b .disable-applet
 
 # Convert to utf-8
 for file in NEWS ; do
@@ -182,6 +182,10 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/gpilot-applet.desktop
 %endif
 
 %changelog
+* Mon Mar 21 2011 Matthew Barnes <mbarnes at redhat.com> - 2.91.92-1
+- Update to 2.91.92
+- Re-enable the evolution-data-server conduits and panel applet.
+
 * Mon Feb 14 2011 Matthew Barnes <mbarnes at redhat.com> - 2.32.0-8
 - Add BR dbus-glib-devel, gtk2-devel.
 
diff --git a/sources b/sources
index 9a8a7a6..6704dcf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b3900a9ba5e6220cb685b21e72ae8196  gnome-pilot-2.32.0.tar.bz2
+c98be27f91e44e51d8c485890568439b  gnome-pilot-2.91.92.tar.bz2