rpms/gnome-pilot/devel gnome-pilot-2.0.12-move-conduits-autotools.patch, 1.1, 1.2 gnome-pilot.spec, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: dmalcolm

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

Modified Files:
	gnome-pilot-2.0.12-move-conduits-autotools.patch 
	gnome-pilot.spec 
Log Message:
* Tue Jun 28 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-5.fc5
- 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.
- Finished removing test conduit



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/devel/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	28 Jun 2005 20:29:14 -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/devel/gnome-pilot.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gnome-pilot.spec	27 Jun 2005 22:08:36 -0000	1.28
+++ gnome-pilot.spec	28 Jun 2005 20:29:14 -0000	1.29
@@ -2,7 +2,7 @@
 Summary: GNOME pilot programs
 Name: gnome-pilot
 Version: 2.0.13
-Release: 4.fc5
+Release: 5.fc5
 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
+* Tue Jun 28 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-5.fc5
+- 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.
+- Finished removing test conduit
+
 * Mon Jun 27 2005 David Malcolm <dmalcolm at redhat.com> - 2.0.13-4.fc5
 - Introduce pilot-link-version macro; use to bump version to 1:0.12.0-0.pre2.0
 - Update gnome-pilot-2.0.12-port-to-pilot-link-0.12.patch to use version by Mark G Adams (#161824; patch 11)