--- gnome-pilot.spec~	2005-06-26 01:16:48.000000000 -0400
+++ gnome-pilot.spec	2005-06-26 17:22:27.000000000 -0400
@@ -76,7 +82,7 @@
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 # fixup location of conduits
-mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
+#mv $RPM_BUILD_ROOT/%{_datadir}/gnome-pilot/conduits/*.conduit $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/
 
 # fixup location of desktop file:
 mkdir $RPM_BUILD_ROOT/%{_datadir}/applications/
@@ -85,6 +91,7 @@
 # remove unwanted files
 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 -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -121,6 +128,7 @@
 %{_datadir}/applications/gpilotd-control-applet.desktop
 %dir %{_datadir}/gnome-pilot
 %dir %{_datadir}/gnome-pilot/conduits
+%{_datadir}/gnome-pilot/conduits/*
 %dir %{_datadir}/gnome-pilot/glade
 %{_datadir}/gnome-pilot/devices.xml
 %{_datadir}/gnome-pilot/glade/*
