Hi,
Could you give me the pointer of your ChangeLog or patch? I'ld like to check if
this problem is fixed with your way.
Actually I have noticed your change for SUNWgnome-libs.spec in 2007-05-03 but
it seems the change has already been integrated in snv_68
However you're referring another fix. Is it right?
Thanks,
fujiwara
Laszlo (Laca) Peter wrote:
> Fujiwara-san,
>
> This is not the right fix.
> 6573761 is a duplicate of 6573766, which I have a fix for in postrun.
> It appears that the jobs are not executed in the right order.
> It'll be fixed in the next build (snv_70).
>
> Please roll back these changes.
>
> Thanks,
> Laca
>
> On Fri, 2007-07-06 at 14:22 +0900, Takao Fujiwara - Tokyo S/W Center
> wrote:
>
>>The attached patch of 6573761 is to avoid scrollkeeper-update errors for
>>locales.
>>
>>Thanks,
>>fujiwara
>>plain text document attachment (SUNWgnome-libs.spec-6573761.diff)
>>--- spec-files/SUNWgnome-libs.spec.orig 2007-07-05 11:54:09.176521000
>>+0900
>>+++ spec-files/SUNWgnome-libs.spec 2007-07-05 11:59:18.954213000 +0900
>>@@ -48,6 +48,7 @@ Requires: SUNWgnome-component
>> 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 @@ rm -rf $BASEDIR/var/lib/scrollkeeper
>> %endif
>>
>> %changelog
>>+* Thu Jul 05 2007 - takao.fujiwara at sun.com
>>+- Added SUNWgnome-xml-root dependency for scrollkeeper-update.
>>+ Fixes 6573761
>> * Wed May 16 2007 - damien.carbery at sun.com
>> - Add Build/Requires SUNWlibgcrypt/-devel for gnome-keyring. Adjust
>> PKG_CONFIG_PATH because gnome-keyring .pc file in subdir now.
>>--- 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 -
>>
>>@@ -192,6 +204,8 @@ test -x $BASEDIR/var/lib/postrun/postrun
>>
>>
>> %changelog
>>+* Thu Jul 05 2007 - takao.fujiwara at sun.com
>>+- Remove "http://.."; in help/*/fsexam-*.omf. Fixes 6573761
>> * Thu Jun 28 2007 - yandong.yao at sun.com
>> - Bump to version 0.4.3
>> * Wed May 30 2007 - yandong.yao at sun.com
>>--- 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
>>+
>> * 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
>>+
>> %patch1 -p1
>> %patch2 -p1
>> %patch3 -p1
>>@@ -143,6 +152,8 @@ done
>> %{_includedir}/totem/*
>>
>> %changelog
>>+* Thu Jul 05 2007 - takao.fujiwara at sun.com
>>+- Remove "http://.."; in help/bg/totem-bg.omf. Fixes 6573761
>> * Fri Jun 22 2007 - jerry.tan at sun.com
>> - put totem plugins into /usr/lib/firefox/plugins
>> * Wed Jun 21 2007 - irene.huang at sun.com
>
>
>
