--- a/ChangeLog	Mon Jul 28 01:59:30 2003 +0000
+++ b/ChangeLog	Mon Jul 28 08:16:43 2003 +0000
@@ -1,3 +1,8 @@
+2003-07-28  Glynn Foster  <[email protected]>
+
+	* gnome-pilot.spec: Clean up a little. Move the applet
+	package into the main one.
+
 2003-07-27  Mark McLoughlin  <[email protected]>
 
 	* patches/gdm-07-potfiles-in.diff: remove. Seems to have

--- a/gnome-pilot.spec	Mon Jul 28 01:59:30 2003 +0000
+++ b/gnome-pilot.spec	Mon Jul 28 08:16:43 2003 +0000
@@ -7,36 +7,21 @@
 Vendor:		Sun Microsystems, Inc.
 Summary:	PalmOS link utilities
 Source:		%{name}-%{version}.tar.bz2
-URL:		http://www.gnome.org/gnome-pilot/
+URL:		http://ftp.gnome.org/pub/GNOME/sources/gnome-pilot
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 Docdir:         %{_defaultdocdir}/gnome-pilot
 Autoreqprov:    on
-Epoch:		1
 
 %define pilot_link_version 0.11.7 
+%define scrollkeeper_version 0.3.11
+%define gnome_panel_version 2.2.1
+
+Requires:	scrollkeeper >= %{scrollkeeper_version}
+Requires:	gnome-panel >= %{gnome_panel_version}
 Requires:       pilot-link >= %{pilot_link_version}
-BuildRequires:	gettext
-BuildRequires:	bonobo-activation-devel
-BuildRequires:	libgnomeui-devel
-BuildRequires:	ORBit2-devel
-BuildRequires:	libbonobo-devel
-BuildRequires:	libgnome-devel
-BuildRequires:	libglade-devel
-BuildRequires:	gnome-vfs-devel
-BuildRequires:	gtk2-devel
-BuildRequires:	glib2-devel
-BuildRequires:	libbonoboui-devel
-BuildRequires:	libIDL-devel
-BuildRequires:	linc-devel
-BuildRequires:	libxml2-devel
-BuildRequires:	pango-devel
-BuildRequires:	libgnomecanvas-devel
-BuildRequires:	libart_lgpl-devel
-BuildRequires:	gnome-panel
-BuildRequires:	gnome-desktop-devel
-BuildRequires:	libwnck
-BuildRequires:	GConf-devel
+BuildRequires:	scrollkeeper >= %{scrollkeeper_version}
 BuildRequires:	pilot-link-devel >= %{pilot_link_version}
+
 Prereq:	scrollkeeper
 
 %description
@@ -44,31 +29,6 @@
 Palm OS-based systems with GNOME, the complete user-friendly desktop 
 based entirely on free software.
 
-%files
-%defattr(-, root, root)
-%{_datadir}/control-center-2.0/capplets/*
-%{_datadir}/idl/*
-%{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*
-%{_bindir}/*
-%{_libexecdir}/gpilotd
-%{_libdir}/bonobo/servers/GNOME_Pilot_Daemon.server
-%{_libdir}/gnome-pilot
-%dir %{_datadir}/gnome-pilot
-%dir %{_datadir}/gnome-pilot/glade
-%{_datadir}/gnome-pilot/conduits
-%{_datadir}/gnome-pilot/glade/*.png
-%{_datadir}/gnome-pilot/glade/gpilotd-capplet.glade
-%{_datadir}/gnome/help/*
-%{_datadir}/omf/*
-%{_datadir}/man/man1/*
-%{_libdir}/*.so.*
-
-
-%post
-/sbin/ldconfig
-/usr/bin/scrollkeeper-update -q
-
 %package -n gnome-pilot-devel
 Summary:	Pilot development header files.
 Group:		Development/Libraries
@@ -80,55 +40,15 @@
 Palm OS-based systems with GNOME, the complete user-friendly desktop 
 based entirely on free software.
 
-%files -n gnome-pilot-devel
-%defattr(-, root, root)
-%{_includedir}/*
-%{_libdir}/*.a
-%{_libdir}/pkgconfig/*
-%{_libdir}/*.so
-%{_libdir}/*.la
-
-%package -n gnome-pilot-applet
-Summary:	GNOME Pilot Panel Applet
-Group:		Applications/Communications
-Requires:	gnome-pilot = %{version}-%{release}
-Prereq:	GConf
-
-%description -n gnome-pilot-applet
-GNOME Pilot provides this panel applet for control and status on your GNOME 1.4 based desktop. This package will not work with GNOME 2.x
-
-%files -n gnome-pilot-applet
-%defattr(-, root, root)
-%{_libdir}/bonobo/servers/GNOME_PilotApplet.server
-%{_libexecdir}/gpilot-applet
-%{_datadir}/gnome-pilot/glade/pilot-applet.glade
-%{_datadir}/locale/*/LC_MESSAGES/*
-%{_sysconfdir}/gconf/schemas/pilot.schemas
-
-%post -n gnome-pilot-applet
-/usr/bin/scrollkeeper-update -q
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-SCHEMAS="pilot.schemas"
-for S in $SCHEMAS; do
-	gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
-done
-GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/pilot.schemas
-
 %prep
 %setup -q
 
 %build
-CFLAGS="$RPM_OPT_FLAGS"					\
-	./configure	--prefix=%{_prefix}		\
-			--datadir=%{_datadir}		\
-			--sysconfdir=%{_sysconfdir}	\
-			--libdir=%{_libdir}		\
-			--libexecdir=%{_libexecdir}	\
-			--localstatedir=/var		\
-			--includedir=%{_includedir}	\
-			--mandir=%{_mandir}		\
-			--infodir=%{_datadir}/info	\
-			--exec-prefix=%{_prefix}
+CFLAGS="$RPM_OPT_FLAGS"				\
+./configure  --prefix=%{_prefix}		\
+	     --sysconfdir=%{_sysconfdir}	\
+	     --mandir=%{_mandir}		\
+	     --localstatedir=/var
 make
 
 %install
@@ -140,7 +60,53 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+scrollkeeper-update -q
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+SCHEMAS="pilot.schemas"
+for S in $SCHEMAS; do
+	gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S >/dev/null
+done
+
+%postun
+scrollkeeper-update -q
+
+%files
+%defattr(-, root, root)
+%{_datadir}/locale/*/LC_MESSAGES/*
+%{_datadir}/control-center-2.0/capplets/*
+%{_datadir}/idl/*
+%{_datadir}/mime-info/*
+%{_datadir}/pixmaps/*
+%{_bindir}/*
+%{_libexecdir}/*
+%{_libdir}/bonobo/servers/*
+%{_libdir}/gnome-pilot
+%dir %{_datadir}/gnome-pilot
+%dir %{_datadir}/gnome-pilot/glade
+%{_datadir}/gnome-pilot/conduits
+%{_datadir}/gnome-pilot/glade/*.png
+%{_datadir}/gnome-pilot/glade/*.glade
+%{_datadir}/gnome/help/*
+%{_datadir}/omf/*
+%{_datadir}/man/man1/*
+%{_sysconfdir}/gconf/schemas/pilot.schemas
+%{_libdir}/*.so.*
+
+%files -n gnome-pilot-devel
+%defattr(-, root, root)
+%{_includedir}/*
+%{_libdir}/*.a
+%{_libdir}/pkgconfig/*
+%{_libdir}/*.so
+%{_libdir}/*.la
+
 %changelog
+* Fri Jul 28 2003 - [email protected]
+- Install the applet as part of the main
+  package. There is no reason to have an 
+  extra package for this one.
+
 * Fri Jul 25 2003 - [email protected]
 - Base package requires pilot-link