Sorry for the delay.
I didn't notice the version is different between vermillion build and CVS head.
I reworked the previous patch.
The point of view:
1. Merged all changes of Makefile.am to $(top_srcdir)/devguide-doc-utils.make
2. Added i18n for .desktop
I'ld like to keep the tarball_version 0.2 in .spec file in this time untill
base %files are updated.
Thanks,
fujiwara
Takao Fujiwara - Tokyo S/W Center wrote:
> Thanks for the review. I'll integrate this tommorrow.
> Yes, we'll integrate .po, .html and style.css files in CVS after we'll get
> the translations.
> As you know, I put "%if 0" for l10n packages at the moment.
>
> Thanks,
> fujiwara
>
> Laszlo (Laca) Peter wrote:
>
>>Hi,
>>
>>Looks good, please commit to CVS.
>>I suspect you will need to add po files there too.
>>It's in the jds CVS, module devguide.
>>
>>Thanks,
>>Laca
>>
>>On Fri, 2007-01-26 at 21:48 +0900, Takao Fujiwara - Tokyo S/W Center
>>wrote:
>>
>>
>>>I try to see i18n for SUNWsolaris-devel-doc.
>>>
>>>The patch provides:
>>>1. gettext for .desktop
>>>2. locale html files.
>>>
>>>I'm not sure if we get the source of a pdf file and swf(flash) files.
>>>
>>>Thanks for your reviews.
>>>plain text document attachment (devguide-01-g11n-desktop.diff)
>>>--- devguide-0.2/Makefile.am.orig 2007-01-25 23:31:46.460903000 +0900
>>>+++ devguide-0.2/Makefile.am 2007-01-26 18:55:24.297562000 +0900
>>>@@ -9,13 +9,38 @@ icondir=$(datadir)/pixmaps
>>>devguide_DATA= \
>>> developer_guide.html
>>>
>>>-desktop_DATA= \
>>>- devguide.desktop
>>>+desktop_in_files= \
>>>+ devguide.desktop.in
>>>+
>>>+desktop_DATA=$(desktop_in_files:.desktop.in=.desktop)
>>>+ at INTLTOOL_DESKTOP_RULE@
>>>
>>>icon_DATA= \
>>> devguide.png
>>>
>>>+install-devguideDATA: $(devguide_DATA)
>>>+ test -z "$(devguidedir)" || $(mkdir_p) "$(DESTDIR)$(devguidedir)"
>>>+ @LINGUAS=`cat $(top_srcdir)/po/LINGUAS | grep -v "^#"`; \
>>>+ list='$(devguide_DATA)'; for p in $$list; do \
>>>+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>>>+ f=$(am__strip_dir) \
>>>+ test -z "$(devguidedir)/C" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/C"; \
>>>+ echo " $(devguideDATA_INSTALL) '$$d$$p'
>>>'$(DESTDIR)$(devguidedir)/C/$$f'"; \
>>>+ $(devguideDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(devguidedir)/C/$$f"; \
>>>+ for ling in $$LINGUAS; do \
>>>+ test -z "$(devguidedir)/$$ling" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/$$ling"; \
>>>+ if test -f $$ling/$$d$$p ; then \
>>>+ file=$$ling/$$d$$p; \
>>>+ else \
>>>+ file=$$d$$p; \
>>>+ fi; \
>>>+ echo " $(devguideDATA_INSTALL) '$$file'
>>>'$(DESTDIR)$(devguidedir)/$$ling/$$f'"; \
>>>+ $(devguideDATA_INSTALL) "$$file"
>>>"$(DESTDIR)$(devguidedir)/$$ling/$$f"; \
>>>+ done; \
>>>+ done
>>>+
>>>EXTRA_DIST= \
>>> $(devguide_DATA) \
>>> $(desktop_DATA) \
>>>+ $(desktop_in_files) \
>>> $(icon_DATA)
>>>--- devguide-0.2/configure.in.orig 2007-01-25 23:32:57.726495000 +0900
>>>+++ devguide-0.2/configure.in 2007-01-26 16:09:09.616055000 +0900
>>>@@ -1,13 +1,16 @@
>>>dnl Process this file with autoconf to create configure.
>>>
>>>AC_INIT(developer_guide.html)
>>>-DEVGUIDE_VERSION=0.2
>>>+DEVGUIDE_VERSION=0.3
>>>AC_SUBST(DEVGUIDE_VERSION)
>>>
>>>AM_INIT_AUTOMAKE(devguide, $DEVGUIDE_VERSION)
>>>AC_PREFIX_DEFAULT([/usr])
>>>AM_MAINTAINER_MODE
>>>
>>>+IT_PROG_INTLTOOL([0.35.0])
>>>+AM_GLIB_GNU_GETTEXT
>>>+
>>>DEVGUIDEDIR='$(datadir)/doc/soldevex/html'
>>>AC_SUBST(DEVGUIDEDIR)
>>>
>>>@@ -18,4 +21,5 @@ content/Makefile
>>>content/SDN/Makefile
>>>content/SunStudio_11/Makefile
>>>content/SunStudio_11/DEMO/Makefile
>>>+po/Makefile.in
>>>])
>>>--- devguide-0.2/devguide.desktop.in.orig 1970-01-01 09:00:00.000000000
>>>+0900
>>>+++ devguide-0.2/devguide.desktop.in 2007-01-26 14:34:50.417010000 +0900
>>>@@ -0,0 +1,11 @@
>>>+[Desktop Entry]
>>>+Encoding=UTF-8
>>>+_Name=Developer Guide
>>>+_Comment=Know more about developing for OpenSolaris.
>>>+_Exec=gnome-open file:/usr/share/doc/soldevex/html/C/developer_guide.html
>>>+Icon=devguide
>>>+Terminal=false
>>>+Type=Application
>>>+Categories=GNOME;GTK;Application;Development;
>>>+OnlyShowIn=GNOME;
>>>+StartupNotify=true
>>>--- devguide-0.2/content/SDN/Makefile.am.orig 2007-01-26
>>>20:05:24.362543000 +0900
>>>+++ devguide-0.2/content/SDN/Makefile.am 2007-01-26 20:21:22.094762000
>>>+0900
>>>@@ -1,9 +1,31 @@
>>>devguidedir=$(DEVGUIDEDIR)
>>>-devguidecontentdir=$(devguidedir)/content
>>>-devguidesdndir=$(devguidecontentdir)/SDN
>>>+sdndir=content/SDN
>>>+devguidesdndir=$(devguidedir)/C/$(sdndir)
>>>
>>>devguidesdn_DATA= \
>>> Sun_DevNetwork111805ds.pdf
>>>
>>>+install-devguidesdnDATA: $(devguidesdn_DATA)
>>>+ @$(NORMAL_INSTALL)
>>>+ test -z "$(devguidedir)" || $(mkdir_p) "$(DESTDIR)$(devguidedir)"
>>>+ @LINGUAS=`cat $(top_srcdir)/po/LINGUAS | grep -v "^#"`; \
>>>+ list='$(devguidesdn_DATA)'; for p in $$list; do \
>>>+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>>>+ f=$(am__strip_dir) \
>>>+ test -z "$(devguidedir)/C/$(sdndir)" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/C/$(sdndir)"; \
>>>+ echo " $(devguidesdnDATA_INSTALL) '$$d$$p'
>>>'$(DESTDIR)$(devguidedir)/C/$(sdndir)/$$f'"; \
>>>+ $(devguidesdnDATA_INSTALL) "$$d$$p"
>>>"$(DESTDIR)$(devguidedir)/C/$(sdndir)/$$f"; \
>>>+ for ling in $$LINGUAS; do \
>>>+ test -z "$(devguidedir)/$$ling/$(sdndir)" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/$$ling/$(sdndir)"; \
>>>+ if test -f $$ling/$$d$$p ; then \
>>>+ file=$$ling/$$d$$p; \
>>>+ else \
>>>+ file=$$d$$p; \
>>>+ fi; \
>>>+ echo " $(devguidesdnDATA_INSTALL) '$$file'
>>>'$(DESTDIR)$(devguidedir)/$$ling/$(sdndir)/$$f'"; \
>>>+ $(devguidesdnDATA_INSTALL) "$$file"
>>>"$(DESTDIR)$(devguidedir)/$$ling/$(sdndir)/$$f"; \
>>>+ done; \
>>>+ done
>>>+
>>>EXTRA_DIST= \
>>> $(devguidesdn_DATA)
>>>--- devguide-0.2/content/SunStudio_11/DEMO/Makefile.am.orig 2007-01-26
>>>18:51:57.584167000 +0900
>>>+++ devguide-0.2/content/SunStudio_11/DEMO/Makefile.am 2007-01-26
>>>18:53:33.415559000 +0900
>>>@@ -1,6 +1,6 @@
>>>devguidedir=$(DEVGUIDEDIR)
>>>-devguidecontentdir=$(devguidedir)/content
>>>-devguidess11demodir=$(devguidecontentdir)/SunStudio_11/DEMO
>>>+ss11demodir=content/SunStudio_11/DEMO
>>>+devguidess11demodir=$(devguidedir)/C/$(ss11demodir)
>>>
>>>devguidess11demo_DATA= \
>>> fractals.swf \
>>>@@ -14,5 +14,26 @@ devguidess11demo_DATA= \
>>> sun_scene04.swf \
>>> sun_studio_demo.html
>>>
>>>+install-devguidess11demoDATA: $(devguidess11demo_DATA)
>>>+ test -z "$(devguidedir)" || $(mkdir_p) "$(DESTDIR)$(devguidedir)"
>>>+ @LINGUAS=`cat $(top_srcdir)/po/LINGUAS | grep -v "^#"`; \
>>>+ list='$(devguidess11demo_DATA)'; for p in $$list; do \
>>>+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>>>+ f=$(am__strip_dir) \
>>>+ test -z "$(devguidedir)/C/$(ss11demodir)" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/C/$(ss11demodir)"; \
>>>+ echo " $(devguidess11demoDATA_INSTALL) '$$d$$p'
>>>'$(DESTDIR)$(devguidedir)/C/$(ss11demodir)/$$f'"; \
>>>+ $(devguidess11demoDATA_INSTALL) "$$d$$p"
>>>"$(DESTDIR)$(devguidedir)/C/$(ss11demodir)/$$f"; \
>>>+ for ling in $$LINGUAS; do \
>>>+ test -z "$(devguidedir)/$$ling/$(ss11demodir)" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/$$ling/$(ss11demodir)"; \
>>>+ if test -f $$ling/$$d$$p ; then \
>>>+ file=$$ling/$$d$$p; \
>>>+ else \
>>>+ file=$$d$$p; \
>>>+ fi; \
>>>+ echo " $(devguidess11demoDATA_INSTALL) '$$file'
>>>'$(DESTDIR)$(devguidedir)/$$ling/$(ss11demodir)/$$f'"; \
>>>+ $(devguidess11demoDATA_INSTALL) "$$file"
>>>"$(DESTDIR)$(devguidedir)/$$ling/$(ss11demodir)/$$f"; \
>>>+ done; \
>>>+ done
>>>+
>>>EXTRA_DIST= \
>>> $(devguidess11demo_DATA)
>>>--- devguide-0.2/po/LINGUAS.orig 1970-01-01 09:00:00.000000000 +0900
>>>+++ devguide-0.2/po/LINGUAS 2007-01-26 18:59:02.980748000 +0900
>>>@@ -0,0 +1 @@
>>>+#
>>>--- devguide-0.2/po/POTFILES.in.orig 1970-01-01 09:00:00.000000000 +0900
>>>+++ devguide-0.2/po/POTFILES.in 2007-01-26 17:43:53.299762000 +0900
>>>@@ -0,0 +1 @@
>>>+devguide.desktop.in
>>>--- devguide-0.2/images/Makefile.am.orig 2007-01-26 20:23:10.383618000
>>>+0900
>>>+++ devguide-0.2/images/Makefile.am 2007-01-26 20:26:55.802486000 +0900
>>>@@ -1,5 +1,6 @@
>>>devguidedir=$(DEVGUIDEDIR)
>>>-devguideimgdir=$(devguidedir)/images
>>>+imgdir=images
>>>+devguideimgdir=$(devguidedir)/C/$(imgdir)
>>>
>>>devguideimg_DATA= \
>>> New_Prod_Banner.jpg \
>>>@@ -7,6 +8,27 @@ devguideimg_DATA= \
>>> spacer.gif \
>>> style.css
>>>
>>>+install-devguideimgDATA: $(devguideimg_DATA)
>>>+ test -z "$(devguidedir)" || $(mkdir_p) "$(DESTDIR)$(devguidedir)"
>>>+ @LINGUAS=`cat $(top_srcdir)/po/LINGUAS | grep -v "^#"`; \
>>>+ list='$(devguideimg_DATA)'; for p in $$list; do \
>>>+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>>>+ f=$(am__strip_dir) \
>>>+ test -z "$(devguidedir)/C/$(imgdir)" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/C/$(imgdir)"; \
>>>+ echo " $(devguideimgDATA_INSTALL) '$$d$$p'
>>>'$(DESTDIR)$(devguidedir)/C/$(imgdir)/$$f'"; \
>>>+ $(devguideimgDATA_INSTALL) "$$d$$p"
>>>"$(DESTDIR)$(devguidedir)/C/$(imgdir)/$$f"; \
>>>+ for ling in $$LINGUAS; do \
>>>+ test -z "$(devguidedir)/$$ling/$(imgdir)" || $(mkdir_p)
>>>"$(DESTDIR)$(devguidedir)/$$ling/$(imgdir)"; \
>>>+ if test -f $$ling/$$d$$p ; then \
>>>+ file=$$ling/$$d$$p; \
>>>+ else \
>>>+ file=$$d$$p; \
>>>+ fi; \
>>>+ echo " $(devguideimgDATA_INSTALL) '$$file'
>>>'$(DESTDIR)$(devguidedir)/$$ling/$(imgdir)/$$f'"; \
>>>+ $(devguideimgDATA_INSTALL) "$$file"
>>>"$(DESTDIR)$(devguidedir)/$$ling/$(imgdir)/$$f"; \
>>>+ done; \
>>>+ done
>>>+
>>>EXTRA_DIST= \
>>> $(devguideimg_DATA)
>>>
>>>plain text document attachment (SUNWsolaris-devel-docs.spec.diff)
>>>--- SUNWsolaris-devel-docs.spec.orig 2007-01-26 21:21:55.581800000 +0900
>>>+++ SUNWsolaris-devel-docs.spec 2007-01-26 21:21:55.068172000 +0900
>>>@@ -12,22 +12,63 @@
>>>Name: SUNWsolaris-devel-docs
>>>Summary: Developer documentation
>>>Version: %{default_pkg_version}
>>>-%define tarball_version 0.2
>>>+%define tarball_version 0.3
>>>Source:
>>>http://dlc.sun.com/osol/jds/downloads/extras/devguide-%{tarball_version}.tar.bz2
>>>SUNW_BaseDir: %{_basedir}
>>>BuildRoot: %{_tmppath}/%{name}-%{version}-build
>>>%include default-depend.inc
>>>
>>>+%if 0
>>>+%if %build_l10n
>>>+%package de
>>>+Summary: %{summary} - German documentation
>>>+SUNW_BaseDir: %{_basedir}
>>>+%include default-depend.inc
>>>+Requires: %{name}
>>>+
>>>+%package es
>>>+Summary: %{summary} - Spanish documentation
>>>+SUNW_BaseDir: %{_basedir}
>>>+%include default-depend.inc
>>>+Requires: %{name}
>>>+
>>>+%package fr
>>>+Summary: %{summary} - French documentation
>>>+SUNW_BaseDir: %{_basedir}
>>>+%include default-depend.inc
>>>+Requires: %{name}
>>>+
>>>+%package ja
>>>+Summary: %{summary} - Japanese documentation
>>>+SUNW_BaseDir: %{_basedir}
>>>+%include default-depend.inc
>>>+Requires: %{name}
>>>+
>>>+%package zhCN
>>>+Summary: %{summary} - Simplified Chinese documentation
>>>+SUNW_BaseDir: %{_basedir}
>>>+%include default-depend.inc
>>>+Requires: %{name}
>>>+%endif
>>>+%endif
>>>+
>>>%prep
>>>%setup -q -n devguide-%{tarball_version}
>>>
>>>%build
>>>+intltoolize --automake -c -f
>>>+aclocal
>>>+autoconf
>>>+automake -a -c -f
>>>./configure --prefix=%{_prefix}
>>>+make
>>>
>>>%install
>>>rm -rf $RPM_BUILD_ROOT
>>>make install DESTDIR=$RPM_BUILD_ROOT
>>>
>>>+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
>>>+
>>>%clean
>>>rm -rf $RPM_BUILD_ROOT
>>>
>>>@@ -35,15 +76,61 @@ rm -rf $RPM_BUILD_ROOT
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%dir %attr (0755, root, other) %{_datadir}/doc
>>>-%{_datadir}/doc/soldevex/html/developer_guide.html
>>>-%{_datadir}/doc/soldevex/html/images
>>>-%{_datadir}/doc/soldevex/html/content
>>>+%{_datadir}/doc/soldevex/html/C/developer_guide.html
>>>+%{_datadir}/doc/soldevex/html/C/images
>>>+%{_datadir}/doc/soldevex/html/C/content
>>>%dir %attr (0755, root, other) %{_datadir}/applications
>>>%{_datadir}/applications/*.desktop
>>>%dir %attr (0755, root, other) %{_datadir}/pixmaps
>>>%{_datadir}/pixmaps/*.png
>>>
>>>+%if 0
>>>+%if %build_l10n
>>>+%files de
>>>+%defattr (-, root, bin)
>>>+%dir %attr (0755, root, sys) %{_datadir}
>>>+%dir %attr (0755, root, other) %{_datadir}/doc
>>>+%{_datadir}/doc/soldevex/html/de/developer_guide.html
>>>+%{_datadir}/doc/soldevex/html/de/images
>>>+%{_datadir}/doc/soldevex/html/de/content
>>>+
>>>+%files es
>>>+%defattr (-, root, bin)
>>>+%dir %attr (0755, root, sys) %{_datadir}
>>>+%dir %attr (0755, root, other) %{_datadir}/doc
>>>+%{_datadir}/doc/soldevex/html/es/developer_guide.html
>>>+%{_datadir}/doc/soldevex/html/es/images
>>>+%{_datadir}/doc/soldevex/html/es/content
>>>+
>>>+%files fr
>>>+%defattr (-, root, bin)
>>>+%dir %attr (0755, root, sys) %{_datadir}
>>>+%dir %attr (0755, root, other) %{_datadir}/doc
>>>+%{_datadir}/doc/soldevex/html/fr/developer_guide.html
>>>+%{_datadir}/doc/soldevex/html/fr/images
>>>+%{_datadir}/doc/soldevex/html/fr/content
>>>+
>>>+%files ja
>>>+%defattr (-, root, bin)
>>>+%dir %attr (0755, root, sys) %{_datadir}
>>>+%dir %attr (0755, root, other) %{_datadir}/doc
>>>+%{_datadir}/doc/soldevex/html/ja/developer_guide.html
>>>+%{_datadir}/doc/soldevex/html/ja/images
>>>+%{_datadir}/doc/soldevex/html/ja/content
>>>+
>>>+%files zhCN
>>>+%defattr (-, root, bin)
>>>+%dir %attr (0755, root, sys) %{_datadir}
>>>+%dir %attr (0755, root, other) %{_datadir}/doc
>>>+%{_datadir}/doc/soldevex/html/zh_CN/developer_guide.html
>>>+%{_datadir}/doc/soldevex/html/zh_CN/images
>>>+%{_datadir}/doc/soldevex/html/zh_CN/content
>>>+%endif
>>>+%endif
>>>+
>>>%changelog
>>>+* Fri Jan 26 2007 - takao.fujiwara at sun.com
>>>+- Added message i18n
>>>* Fri Dec 8 2006 - laca at sun.com
>>>- bump to 0.2, update %files
>>>* Wed Dec 6 2006 - laca at sun.com
>>
>>
>>
>
>
>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: devguide-01-g11n-desktop.diff
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20070205/03375ace/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: SUNWsolaris-devel-docs.spec.diff
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20070205/03375ace/attachment-0001.ksh>
