--- a/ChangeLog	Thu Jul 05 21:05:27 2007 +0000
+++ b/ChangeLog	Fri Jul 06 13:12:09 2007 +0000
@@ -1,3 +1,11 @@
+2007-07-06  Takao Fujiwara  <[email protected]>
+
+	* SUNWgnome-libs.spec: Updated.
+	* closed/SUNWfsexam.spec: Updated.
+	* base-specs/gtkam.spec: Updated.
+	* base-specs/totem.spec: Updated. Fixed scrollkeeper-update errors
+	  during snv installation. Fixes 6573761.
+
 2007-07-05  Damien Carbery <[email protected]>
 
 	* base-specs/pygtksourceview.spec: Added. Python bindings for

--- a/SUNWgnome-libs.spec	Thu Jul 05 21:05:27 2007 +0000
+++ b/SUNWgnome-libs.spec	Fri Jul 06 13:12:09 2007 +0000
@@ -48,6 +48,7 @@
 Requires: SUNWgnome-config
 Requires: SUNWlxsl
 Requires: SUNWpostrun
+Requires: SUNWgnome-xml-root
 BuildRequires: SUNWgnome-config-devel
 BuildRequires: SUNWgnome-component-devel
 BuildRequires: SUNWgnome-a11y-base-devel
@@ -301,6 +302,9 @@
 %endif
 
 %changelog
+* Thu Jul 05 2007 - [email protected]
+- Added SUNWgnome-xml-root dependency for scrollkeeper-update.
+  Fixes 6573761
 * Wed May 16 2007 - [email protected]
 - Add Build/Requires SUNWlibgcrypt/-devel for gnome-keyring. Adjust
   PKG_CONFIG_PATH because gnome-keyring .pc file in subdir now.

--- a/base-specs/gtkam.spec	Thu Jul 05 21:05:27 2007 +0000
+++ b/base-specs/gtkam.spec	Fri Jul 06 13:12:09 2007 +0000
@@ -79,6 +79,7 @@
 autoconf
 CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
 		--bindir=%{_bindir} \
+		--datadir=%{_datadir} \
 		--libdir=%{_libdir} \
                 --includedir=%{_includedir} \
 		--mandir=%{_mandir}		\
@@ -126,6 +127,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Thu Jul 05 2007 - [email protected]
+- Add datadir option for configure. Fixes 6573761
+
 * Fri Jun 01 2007 - [email protected]
 - Add GMSFMT=msgfmt for the workaround of bug 6559323/sourforge #1599622.
 

--- a/base-specs/totem.spec	Thu Jul 05 21:05:27 2007 +0000
+++ b/base-specs/totem.spec	Fri Jul 06 13:12:09 2007 +0000
@@ -57,7 +57,16 @@
 %if %build_l10n
 bzcat %SOURCE1 | tar xf -
 cd po-sun; make; cd ..
+
+# 6573761: Use the local dtd for scrollkeeper-update.
+REMOTE_DTD=http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd
+LOCAL_DTD=/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
+sed -e "s|$REMOTE_DTD|$LOCAL_DTD|" \
+  help/bg/totem-bg.omf > /tmp/totem-bg.omf
+rm help/bg/totem-bg.omf
+mv /tmp/totem-bg.omf help/bg/totem-bg.omf
 %endif
+
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -143,6 +152,8 @@
 %{_includedir}/totem/*
 
 %changelog
+* Thu Jul 05 2007 - [email protected]
+- Remove "http://.." in help/bg/totem-bg.omf. Fixes 6573761
 * Fri Jun 22 2007 - [email protected]
 - put totem plugins into /usr/lib/firefox/plugins
 * Wed Jun 21 2007 - [email protected]

--- a/closed/SUNWfsexam.spec	Thu Jul 05 21:05:27 2007 +0000
+++ b/closed/SUNWfsexam.spec	Fri Jul 06 13:12:09 2007 +0000
@@ -61,6 +61,18 @@
 
 %prep
 %setup -q -n %{cmpt}-%{version}
+%if %build_l10n
+# 6573761: Use the local dtd for scrollkeeper-update.
+REMOTE_DTD=http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd
+LOCAL_DTD=/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
+for omf in help/*/%{cmpt}-*.omf
+do
+  sed -e "s|$REMOTE_DTD|$LOCAL_DTD|" \
+    $omf > /tmp/%{cmpt}.omf
+  rm $omf
+  mv /tmp/%{cmpt}.omf $omf
+done
+%endif
 bzcat %SOURCE1 | tar xf -
 gzcat %SOURCE3 | tar xf -
 
@@ -192,6 +204,8 @@
 
 
 %changelog
+* Thu Jul 05 2007 - [email protected]
+- Remove "http://.." in help/*/fsexam-*.omf. Fixes 6573761
 * Thu Jun 28 2007 - [email protected]
 - Bump to version 0.4.3
 * Wed May 30 2007 - [email protected]