--- a/ChangeLog	Tue Mar 16 11:13:54 2004 +0000
+++ b/ChangeLog	Tue Mar 16 11:18:09 2004 +0000
@@ -1,3 +1,8 @@
+2004-03-17  Laszlo Peter  <[email protected]>
+
+	* gnome-pilot.spec: add patch5 to fix build with newer versions of 
+	  automake; add --libexecdir to configure args
+
 2004-03-17  Glynn Foster  <[email protected]>
 
 	* gucharmap.spec: Update to 1.3.2

--- a/gnome-pilot.spec	Tue Mar 16 11:13:54 2004 +0000
+++ b/gnome-pilot.spec	Tue Mar 16 11:18:09 2004 +0000
@@ -12,6 +12,7 @@
 Patch2:     	gnome-pilot-02-menu-entry.diff
 Patch3:     	gnome-pilot-03-add-all-linguas.diff
 Patch4:     	gnome-pilot-04-g11n-i18n-ui.diff
+Patch5:         gnome-pilot-05-automake-fix.diff
 URL:		http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Docdir:         %{_defaultdocdir}/gnome-pilot
@@ -51,6 +52,7 @@
 bzcat %SOURCE1 | tar xvf -
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 LC_ALL=
@@ -65,6 +67,7 @@
 ./configure  --prefix=%{_prefix}		\
 	     --sysconfdir=%{_sysconfdir}	\
 	     --mandir=%{_mandir}		\
+             --libexecdir=%{_libexecdir}        \
 	     --localstatedir=/var
 make
 
@@ -116,6 +119,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Mar 16 2004 - [email protected]
+- add patch5 to fix build with newer versions of automake
+
 * Fri Mar 05 2004 - [email protected]
 - Modified %files section in spec file to fix 4932068
 - Changed gnome-pilot-04-trans-pilot-menu.diff to gnome-pilot-04-g11n-i18n-ui.diff

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-pilot-05-automake-fix.diff	Tue Mar 16 11:18:09 2004 +0000
@@ -0,0 +1,21 @@
+--- gnome-pilot-2.0.10/gpilotd/Makefile.am.orig	2004-03-16 22:48:52.000000000 +1300
++++ gnome-pilot-2.0.10/gpilotd/Makefile.am	2004-03-16 22:49:09.000000000 +1300
+@@ -165,6 +165,7 @@
+ 	gpilot-gui.h 			\
+ 	gpilot-gui.c			\
+ 	$(NULL)
++gpilotd_CFLAGS = $(AM_CFLAGS)
+ 
+ gpilotd_LDFLAGS = -export-dynamic
+ 
+--- gnome-pilot-2.0.10/capplet/Makefile.am.orig	2004-03-16 23:44:57.000000000 +1300
++++ gnome-pilot-2.0.10/capplet/Makefile.am	2004-03-16 23:45:25.000000000 +1300
+@@ -32,7 +32,7 @@
+ 
+ gpilotd_control_applet_LDADD = \
+ 	$(top_builddir)/gpilotd/gnome-pilot-structures.o 	\
+-	$(top_builddir)/gpilotd/gpilot-gui.o 			\
++	$(top_builddir)/gpilotd/gpilotd-gpilot-gui.o 		\
+ 	$(top_builddir)/gpilotd/gnome-pilot-conduit.o 		\
+ 	$(top_builddir)/gpilotd/libgpilotd.la 			\
+ 	$(top_builddir)/gpilotd/libgpilotdconduit.la    	\