--- a/gtkam.spec	Tue Aug 23 13:36:50 2005 +0000
+++ b/gtkam.spec	Tue Aug 23 16:46:21 2005 +0000
@@ -16,7 +16,6 @@
 Vendor:       Sun Microsystems, Inc.
 Summary:      A GTK Digital Camera Viewing Tool
 Source:       http://easynews.dl.sourceforge.net/sourceforge/gphoto/%{name}-%{version}.tar.gz
-Source:       http://www.gphoto.org/download/gtkam-%{version}.tar.bz2
 Source1:      gexif-%{gexif_version}.tar.bz2
 Patch1:	      gtkam-01-menu-entry.diff
 Patch2:	      gtkam-02-enable-deprecated.diff
@@ -96,10 +95,13 @@
 	make prefix=$RPM_BUILD_ROOT%{_prefix} install-strip
 cd ..
 
-mv $RPM_BUILD_ROOT%{_libdir}/gimp/1.3 $RPM_BUILD_ROOT%{_libdir}/gimp/2.0
+#FIXME: no %{_libdir}!
+# mv $RPM_BUILD_ROOT%{_libdir}/gimp/1.3 $RPM_BUILD_ROOT%{_libdir}/gimp/2.0
 
-#FIXME: doc file has a syntax error and breaks the build
-#javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
+javahelp-convert-install $RPM_BUILD_ROOT %{name} %{name}.xml
+
+# FIXME: Remove scrollkeeper files
+rm -rf $RPM_BUILD_ROOT%{_prefix}/var/scrollkeeper
 
 %clean
 rm -rf $RPM_BUILD_ROOT;
@@ -115,9 +117,9 @@
 %{_datadir}/locale/*/*/*
 %{_datadir}/applications/*
 %{_datadir}/gnome/help
-#%{_datadir}/gnome/javahelp
+%{_datadir}/gnome/javahelp
 %{_datadir}/omf/*
-%{_libdir}/gimp/*/plug-ins/gtkam-gimp
+# %{_libdir}/gimp/*/plug-ins/gtkam-gimp
 %{_mandir}/man1/*
 
 %changelog