On Fri, 2007-07-06 at 23:54 +0900, Takao Fujiwara - Tokyo S/W Center
wrote:
> I reverted the fix at the moment.
>
> >>>It appears that the jobs are not executed in the right order.
>
> I guess you pointed out my update of SUNWgnome-libs.spec but I also changed
> gtkam.spec, totem.spec and SUNWfsexam.spec not for the installation order.
Specific comments for those below:
> >>>>--- spec-files/closed/SUNWfsexam.spec.orig 2007-07-05
> >>>>15:08:59.240898000 +0900
> >>>>+++ spec-files/closed/SUNWfsexam.spec 2007-07-05 15:14:04.143407000
> >>>>+0900
> >>>>@@ -61,6 +61,18 @@ legacy encoding to UTF8 encoding.
> >>>>
> >>>>%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 -
> >>>>
This should also be fixed by my fix, as this is a side effect of
running scrollkeeper-update before SUNWgnome-xml-root's postrun
script. The latter adds a rewrite rule to the xml catalog, which
tells libxml2 to use the local file instead of the remote one.
> >>>>--- spec-files/base-specs/gtkam.spec.orig 2007-07-05 15:42:21.848585000
> >>>>+0900
> >>>>+++ spec-files/base-specs/gtkam.spec 2007-07-05 15:44:36.349450000
> >>>>+0900
> >>>>@@ -79,6 +79,7 @@ automake -a -c -f
> >>>>autoconf
> >>>>CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
> >>>> --bindir=%{_bindir} \
> >>>>+ --datadir=%{_datadir} \
> >>>> --libdir=%{_libdir} \
> >>>> --includedir=%{_includedir} \
> >>>> --mandir=%{_mandir} \
> >>>>@@ -126,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT;
> >>>>%{_mandir}/man1/*
> >>>>
> >>>>%changelog
> >>>>+* Thu Jul 05 2007 - takao.fujiwara at sun.com
> >>>>+- Add datadir option for configure. Fixes 6573761
> >>>>+
Are you sure this helps? I don't think so, I remember trying
this before.
> >>>>* Fri Jun 01 2007 - takao.fujiwara at sun.com
> >>>>- Add GMSFMT=msgfmt for the workaround of bug 6559323/sourforge #1599622.
> >>>>
> >>>>--- spec-files/base-specs/totem.spec.orig 2007-07-05 13:55:39.706287000
> >>>>+0900
> >>>>+++ spec-files/base-specs/totem.spec 2007-07-05 14:48:00.183496000
> >>>>+0900
> >>>>@@ -57,7 +57,16 @@ wide range of multimedia formats
> >>>>%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
> >>>>+
Same comments as for SUNWfsexam.spec.
Laca
