rpms/gnome-pilot/FC-4 gnome-pilot-2.0.12-move-conduits-autotools.patch, 1.1, 1.2 gnome-pilot.spec, 1.29, 1.30 rh-161799-attach-116013-backup_conduit_update.diff, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

Update of /cvs/dist/rpms/gnome-pilot/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17748

Modified Files:
	gnome-pilot-2.0.12-move-conduits-autotools.patch 
	gnome-pilot.spec 
	rh-161799-attach-116013-backup_conduit_update.diff 
Log Message:
* Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-5.fc4
- Regenerate patch 18 with a fix for a crash in the backup conduit (would crash whenever no modifications had occurred since the last sync)
- Fixed gnome-pilot-2.0.12-move-conduits-autotools.patch to set GNOME_PILOT_CONDUIT_SEARCH_PATH to libdir/gnome-pilot/conduits
  rather than share/gnome-pilot/conduits; should be able to find conduits now.



gnome-pilot-2.0.12-move-conduits-autotools.patch:
 configure.in |    4 ++++
 1 files changed, 4 insertions(+)

Index: gnome-pilot-2.0.12-move-conduits-autotools.patch
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/gnome-pilot-2.0.12-move-conduits-autotools.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnome-pilot-2.0.12-move-conduits-autotools.patch	17 Mar 2005 00:51:06 -0000	1.1
+++ gnome-pilot-2.0.12-move-conduits-autotools.patch	30 Jun 2005 23:00:51 -0000	1.2
@@ -8,7 +8,7 @@
 +dnl **************************************************
 +dnl * conduit dir
 +dnl **************************************************
-+AC_DEFINE_UNQUOTED(GNOME_PILOT_CONDUIT_SEARCH_PATH, "${_libdir}/share/gnome-pilot/conduits", "Directory for .conduit files")
++AC_DEFINE_UNQUOTED(GNOME_PILOT_CONDUIT_SEARCH_PATH, "${libdir}/gnome-pilot/conduits", "Directory for .conduit files")
  
  AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps", "Icon directory")
  


Index: gnome-pilot.spec
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/gnome-pilot.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- gnome-pilot.spec	27 Jun 2005 21:58:57 -0000	1.29
+++ gnome-pilot.spec	30 Jun 2005 23:00:51 -0000	1.30
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 4.fc4
+Release: 5.fc4
 License: LGPL
 Group: Applications/Communications
 Source: ftp://ftp.gnome.org/pub/gnome/sources/gnome-pilot/2.0/%{name}-%{version}.tar.bz2
@@ -95,7 +95,7 @@
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.{a,la}
 rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*test_conduit.*
-rm -f $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*test.*
+rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/test.conduit
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
 %find_lang %{name}
@@ -148,6 +148,11 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Wed Jun 29 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-5.fc4
+- Regenerate patch 18 with a fix for a crash in the backup conduit (would crash whenever no modifications had occurred since the last sync)
+- Fixed gnome-pilot-2.0.12-move-conduits-autotools.patch to set GNOME_PILOT_CONDUIT_SEARCH_PATH to libdir/gnome-pilot/conduits
+  rather than share/gnome-pilot/conduits; should be able to find conduits now.
+
 * Mon Jun 27 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-4.fc4
 - rebuilt
 

rh-161799-attach-116013-backup_conduit_update.diff:
 backup_conduit.c |   63 ++++++++++++++++++++++++-------------------------------
 1 files changed, 28 insertions(+), 35 deletions(-)

Index: rh-161799-attach-116013-backup_conduit_update.diff
===================================================================
RCS file: /cvs/dist/rpms/gnome-pilot/FC-4/rh-161799-attach-116013-backup_conduit_update.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rh-161799-attach-116013-backup_conduit_update.diff	27 Jun 2005 21:50:41 -0000	1.1
+++ rh-161799-attach-116013-backup_conduit_update.diff	30 Jun 2005 23:00:51 -0000	1.2
@@ -1,5 +1,5 @@
---- conduits/backup/backup_conduit.c.memfix	2005-06-27 10:14:46.000000000 -0400
-+++ conduits/backup/backup_conduit.c	2005-06-27 10:15:37.000000000 -0400
+--- ./conduits/backup/backup_conduit.c.backup_conduit_update	2005-06-28 15:09:07.000000000 -0400
++++ ./conduits/backup/backup_conduit.c	2005-06-28 18:20:58.000000000 -0400
 @@ -387,9 +387,10 @@
  	int keep_reading;
  	int entries;
@@ -127,11 +127,13 @@
  	if (pi_file_close (f) < 0) {
  		g_warning("backup conduit can't write file");
  		gnome_pilot_conduit_send_error(GNOME_PILOT_CONDUIT(conduit),
-@@ -593,6 +583,7 @@
+@@ -593,6 +583,9 @@
   exit_and_free:
  	pi_file_close (f);
  	g_free (name);
-+	pi_buffer_free (piBuf);
++	if (piBuf) {
++		pi_buffer_free (piBuf);
++	}
   exit:	
  	return result;	
  }