Sorry, yesterday was a holiday.
I agree to separate gimp l10n help files from SUNWgnome-l10ndocument-xx because
of the file sizes.
# du -sk /usr/share/gimp/2.0/help/images/*/de
1246 /usr/share/gimp/2.0/help/images/dialogs/de
8964 /usr/share/gimp/2.0/help/images/filters/de
1044 /usr/share/gimp/2.0/help/images/menus/de
1206 /usr/share/gimp/2.0/help/images/preferences/de
2343 /usr/share/gimp/2.0/help/images/toolbox/de
677 /usr/share/gimp/2.0/help/images/using/de
It seems the size of SUNWgnome-img-editor-help-de is as large as one of
SUNWgnome-l10ndocument-de.
Since gimp is a image editor, the help may have many image files.
Please go ahead with your idea.
>>>%package ru
>>>Summary: Gimp on-line help in Russian
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: ru
Please use SUNWLoc: ru_RU
>>>%package sv
>>>Summary: Gimp on-line help in Swedish
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: ru
Correction of typo SUNW_Loc: sv
>>>%package ko
>>>Summary: Gimp on-line help in Korean
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: ko
I'ld like SUNW_Loc: ko,ko.UTF-8
>>>%package extra
>>>Summary: Gimp on-line help in other languages
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: nl,no_NO,hr_HR
Please use SUNW_Loc: nl_BE,nl_NL,no_NO,hr_HR
Thanks,
fujiwara
Laszlo (Laca) Peter wrote:
> I have 2 reasons for using separate packages:
> - gimp doesn't use the usual scrollkeeper/rarian xml docs
> and the docs aren't showing up in yelp either
> - the gimp docs are large, with lots of images and
> you may not want to install them on a space constrained system.
>
> I definitely want the English help separately from Gimp itself,
> but if you think it's better, we can merge the localised help into
> the SUNWgnome-l10ndocument-xx packages.
>
> Let me know what you think.
>
> Thanks,
> Laca
>
> On Fri, 2008-01-11 at 21:21 +0900, Takao Fujiwara - Tokyo S/W Center
> wrote:
>
>>I'ld like to combine all help files for desktop modules with
>>SUNWgnome-l10ndocument-$lang instead of new l10n packages since other modules
>>are also combined.
>>My understanding is it's a normal GTK based application with GPL and user
>>application.
>>
>>Do you have any concerns?
>>
>>
>>Laszlo (Laca) Peter wrote:
>>
>>>Currently SUNWgnome-img-editor includes the code, data and on-line
>>>help for Gimp. In fact, it includes the help for all locales,
>>>which is clearly wrong.
>>>
>>>I suggest that:
>>>
>>>1) English help is moved into SUNWgnome-img-editor-help (new pkg)
>>>2) Localised help docs moved into separate packages, by locale,
>>> similarly to the l10nmessages and l10ndocuments packages
>>>
>>>Attached are 2 new spec files: SUNWgnome-img-editor-help.spec and
>>>gimp-help.spec. These build the help packages. Could the g11n
>>>people pls review especially the SUNW_Loc etc. tags.
>>>Also attached is the patch agains SUNWgnome-img-editor.spec and
>>>gimp.spec that removes the help stuff.
>>>
>>>
>>>
>>>------------------------------------------------------------------------
>>>
>>>#
>>># spec file for package SUNWgnome-img-editor-help
>>>#
>>># includes module(s): gimp-help
>>>#
>>># Copyright 2008 Sun Microsystems, Inc.
>>># This file and all modifications and additions to the pristine
>>># package are under the same license as the package itself.
>>>#
>>># Owner: dkenny
>>>#
>>>%include Solaris.inc
>>>
>>>%use gimp_help = gimp-help.spec
>>>
>>>Name: SUNWgnome-img-editor-help
>>>Summary: The Gimp image editor - on-line help documents
>>>Version: %{default_pkg_version}
>>>SUNW_BaseDir: %{_basedir}
>>>BuildRoot: %{_tmppath}/%{name}-%{version}-build
>>>
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor
>>>BuildRequires: SUNWgnome-img-editor-devel
>>>BuildRequires: SUNWgnome-common-devel
>>>
>>>%if %build_l10n
>>>%package de
>>>Summary: Gimp on-line help in German
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: de
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package es
>>>Summary: Gimp on-line help in Spanish
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: es
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package fr
>>>Summary: Gimp on-line help in French
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: fr
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package it
>>>Summary: Gimp on-line help in Italian
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: it
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package ko
>>>Summary: Gimp on-line help in Korean
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: ko
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package ru
>>>Summary: Gimp on-line help in Russian
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: ru
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package sv
>>>Summary: Gimp on-line help in Swedish
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: ru
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package cs
>>>Summary: Gimp on-line help in Czech
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: cs_CZ
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package zhCN
>>>Summary: Gimp on-line help in Simplified Chinese
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: zh,zh.GBK,zh_CN.GB18030,zh.UTF-8
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>
>>>%package extra
>>>Summary: Gimp on-line help in other languages
>>>SUNW_BaseDir: %{_basedir}
>>>SUNW_PkgList: SUNWgnome-img-editor
>>>SUNW_Loc: nl,no_NO,hr_HR
>>>%include default-depend.inc
>>>Requires: SUNWgnome-img-editor-help
>>>%endif
>>>
>>>%prep
>>>rm -rf %name-%version
>>>mkdir %name-%version
>>>%gimp_help.prep -d %name-%version
>>>
>>>%build
>>>%gimp_help.build -d %name-%version
>>>
>>>%install
>>>rm -rf $RPM_BUILD_ROOT
>>>%gimp_help.install -d %name-%version
>>>
>>>%if %build_l10n
>>>%else
>>># REMOVE l10n FILES
>>>for loc in cs de es fr hr it ko nl no ru sv zh_CN; do
>>> rm -rf $RPM_BUILD_ROOT%{_datadir}/gimp/*/help/$loc
>>> for subdir in callouts dialogs dialogs/examples filters filters/examples
>>> \
>>> glossary math menus preferences tool-options toolbox tutorials using; do
>>> rm -rf $RPM_BUILD_ROOT%{_datadir}/gimp/*/help/images/$subdir/$loc
>>> done
>>>done
>>>%endif
>>>
>>>%{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c
>>>"%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date
>>>+%%Y-%%m-%%d):unsupported" $RPM_BUILD_ROOT}
>>>
>>>%clean
>>>rm -rf $RPM_BUILD_ROOT
>>>
>>>%files
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/en
>>>%{_datadir}/gimp/*/help/images/*.png
>>>%{_datadir}/gimp/*/help/images/callouts/*.png
>>>%{_datadir}/gimp/*/help/images/dialogs/*.png
>>>%{_datadir}/gimp/*/help/images/dialogs/examples/*.{png,gif,jpg,mng}
>>>%{_datadir}/gimp/*/help/images/filters/*.png
>>>%{_datadir}/gimp/*/help/images/filters/examples/*.{png,jpg,mng,xcf}
>>>%{_datadir}/gimp/*/help/images/glossary/*.png
>>>%{_datadir}/gimp/*/help/images/math/*.png
>>>%{_datadir}/gimp/*/help/images/menus/*.png
>>>%{_datadir}/gimp/*/help/images/preferences/*.png
>>>%{_datadir}/gimp/*/help/images/tool-options/*.png
>>>%{_datadir}/gimp/*/help/images/toolbox/*.png
>>>%{_datadir}/gimp/*/help/images/tutorials/*.{png,jpg}
>>>%{_datadir}/gimp/*/help/images/using/*.{png,jpg}
>>>
>>>%if %build_l10n
>>>%files de
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/de
>>>%{_datadir}/gimp/*/help/images/dialogs/de
>>>%{_datadir}/gimp/*/help/images/filters/de
>>>%{_datadir}/gimp/*/help/images/filters/examples/de
>>>%{_datadir}/gimp/*/help/images/menus/de
>>>%{_datadir}/gimp/*/help/images/preferences/de
>>>%{_datadir}/gimp/*/help/images/toolbox/de
>>>%{_datadir}/gimp/*/help/images/using/de
>>>
>>>%files es
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/es
>>>%{_datadir}/gimp/*/help/images/dialogs/es
>>>%{_datadir}/gimp/*/help/images/filters/es
>>>%{_datadir}/gimp/*/help/images/menus/es
>>>%{_datadir}/gimp/*/help/images/preferences/es
>>>%{_datadir}/gimp/*/help/images/tool-options/es
>>>%{_datadir}/gimp/*/help/images/toolbox/es
>>>%{_datadir}/gimp/*/help/images/using/es
>>>
>>>%files fr
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/fr
>>>%{_datadir}/gimp/*/help/images/dialogs/fr
>>>%{_datadir}/gimp/*/help/images/filters/fr
>>>%{_datadir}/gimp/*/help/images/filters/examples/fr
>>>%{_datadir}/gimp/*/help/images/menus/fr
>>>%{_datadir}/gimp/*/help/images/preferences/fr
>>>%{_datadir}/gimp/*/help/images/toolbox/fr
>>>%{_datadir}/gimp/*/help/images/using/fr
>>>
>>>%files it
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/it
>>>%{_datadir}/gimp/*/help/images/dialogs/it
>>>%{_datadir}/gimp/*/help/images/filters/it
>>>%{_datadir}/gimp/*/help/images/filters/examples/it
>>>%{_datadir}/gimp/*/help/images/menus/it
>>>%{_datadir}/gimp/*/help/images/preferences/it
>>>%{_datadir}/gimp/*/help/images/tool-options/it
>>>%{_datadir}/gimp/*/help/images/toolbox/it
>>>%{_datadir}/gimp/*/help/images/tutorials/it
>>>%{_datadir}/gimp/*/help/images/using/it
>>>
>>>%files ko
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/ko
>>>%{_datadir}/gimp/*/help/images/dialogs/ko
>>>%{_datadir}/gimp/*/help/images/toolbox/ko
>>>%{_datadir}/gimp/*/help/images/using/ko
>>>
>>>%files ru
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/ru
>>>%{_datadir}/gimp/*/help/images/dialogs/ru
>>>%{_datadir}/gimp/*/help/images/preferences/ru
>>>%{_datadir}/gimp/*/help/images/using/ru
>>>
>>>%files sv
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/sv
>>>
>>>%files cs
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/images/dialogs/cs
>>>%{_datadir}/gimp/*/help/images/filters/cs
>>>%{_datadir}/gimp/*/help/images/menus/cs
>>>%{_datadir}/gimp/*/help/images/toolbox/cs
>>>%{_datadir}/gimp/*/help/images/using/cs
>>>
>>>%files zhCN
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>>%{_datadir}/gimp/*/help/images/dialogs/zh_CN
>>>%{_datadir}/gimp/*/help/images/filters/zh_CN
>>>%{_datadir}/gimp/*/help/images/menus/zh_CN
>>>%{_datadir}/gimp/*/help/images/preferences/zh_CN
>>>%{_datadir}/gimp/*/help/images/toolbox/zh_CN
>>>%{_datadir}/gimp/*/help/images/using/zh_CN
>>>
>>>%files extra
>>>%defattr (-, root, bin)
>>>%dir %attr (0755, root, sys) %{_datadir}
>>># nl locale
>>>%{_datadir}/gimp/*/help/nl
>>>%{_datadir}/gimp/*/help/images/dialogs/nl
>>>%{_datadir}/gimp/*/help/images/preferences/nl
>>>%{_datadir}/gimp/*/help/images/toolbox/nl
>>>%{_datadir}/gimp/*/help/images/using/nl
>>># no locale
>>>%{_datadir}/gimp/*/help/no
>>>%{_datadir}/gimp/*/help/images/dialogs/no
>>>%{_datadir}/gimp/*/help/images/filters/examples/no
>>>%{_datadir}/gimp/*/help/images/filters/no
>>>%{_datadir}/gimp/*/help/images/math/no
>>>%{_datadir}/gimp/*/help/images/menus/no
>>>%{_datadir}/gimp/*/help/images/preferences/no
>>>%{_datadir}/gimp/*/help/images/toolbox/no
>>>%{_datadir}/gimp/*/help/images/tutorials/no
>>>%{_datadir}/gimp/*/help/images/using/no
>>># hr locale
>>>%{_datadir}/gimp/*/help/images/using/hr
>>>%endif
>>>
>>>%changelog
>>>* Fri Jan 11 2008 - laca at sun.com
>>>- create - split from SUNWgnome-img-editor.spec
>>>
>>>
>>>------------------------------------------------------------------------
>>>
>>>#
>>># spec file for package gimp-help
>>>#
>>># Copyright 2008 Sun Microsystems, Inc.
>>># This file and all modifications and additions to the pristine
>>># package are under the same license as the package itself.
>>>#
>>># Owner: dkenny
>>>#
>>>Name: gimp-help
>>>License: GPL/LGPL
>>>Group: System/Documentation/GNOME
>>>Version: 2.4.0
>>>Release: 1
>>>Distribution: Java Desktop System
>>>Vendor: Sun Microsystems, Inc.
>>>Summary: On-line Help for the GIMP (GNU Image Manipulation Program)
>>>Source: ftp://ftp.gimp.org/pub/gimp/help/%{name}-%{version}.tar.bz2
>>>URL: http://www.gimp.org
>>>BuildRoot: %{_tmppath}/%{name}-%{version}-build
>>>Docdir: %{_defaultdocdir}/doc
>>>Autoreqprov: on
>>>Requires: gimp
>>>
>>>%description
>>>On-Line help documents for the Gimp.
>>>
>>>%prep
>>>%setup -q
>>>
>>>%build
>>>./configure --prefix=%{_prefix} \
>>> --sysconfdir=%{_sysconfdir} \
>>> --bindir=%{_bindir} \
>>> --libdir=%{_libdir} \
>>> --includedir=%{_includedir} \
>>> --libexecdir=%{_libexecdir} \
>>> --localstatedir=/var/lib \
>>> --mandir=%{_mandir} \
>>> --enable-mp \
>>> %{gtk_doc_option} \
>>> --enable-default-binary \
>>> --without-gimp \
>>> %{print_options}
>>>
>>>make
>>>
>>>%install
>>>make DESTDIR=$RPM_BUILD_ROOT install
>>>
>>>%clean
>>>rm -rf $RPM_BUILD_ROOT
>>>
>>>%files
>>>%defattr (-, root, root)
>>>%{_datadir}/gimp/*/help/
>>>
>>>%changelog
>>>* Fri Jan 11 2008 - laca at sun.com
>>>- Create -- split out of gimp.spec
>>>
>>>
>>>------------------------------------------------------------------------
>>>
>>>Index: SUNWgnome-img-editor.spec
>>>===================================================================
>>>--- SUNWgnome-img-editor.spec (revision 12726)
>>>+++ SUNWgnome-img-editor.spec (working copy)
>>>@@ -3,7 +3,7 @@
>>> #
>>> # includes module(s): gimp
>>> #
>>>-# Copyright 2007 Sun Microsystems, Inc.
>>>+# Copyright 2008 Sun Microsystems, Inc.
>>> # This file and all modifications and additions to the pristine
>>> # package are under the same license as the package itself.
>>> #
>>>@@ -74,7 +74,6 @@
>>> %gimp.prep -d %name-%version
>>>
>>> %build
>>>-export
>>>PKG_CONFIG_PATH=/jds/packages/BUILD/%{name}-%{version}/gimp-%{gimp.subver}.%{gimp.microver}:%{_pkg_config_path}
>>> export CFLAGS="%optflags -I%{_includedir} -KPIC"
>>> export RPM_OPT_FLAGS="$CFLAGS"
>>> export CPPFLAGS="-I/usr/sfw/include"
>>>@@ -161,6 +160,8 @@
>>> %{_mandir}/*/*
>>>
>>> %changelog
>>>+* Fri Jan 11 2008 - laca at sun.com
>>>+- delete PKG_CONFIG_PATH setting since help was removed
>>> * Fri Sep 28 2007 - laca at sun.com
>>> - delete Nevada X dep
>>> * Tue Apr 24 2007 - laca at sun.com
>>>Index: base-specs/gimp.spec
>>>===================================================================
>>>--- base-specs/gimp.spec (revision 12726)
>>>+++ base-specs/gimp.spec (working copy)
>>>@@ -1,7 +1,7 @@
>>> #
>>> # spec file for package gimp
>>> #
>>>-# Copyright (c) 2005 Sun Microsystems, Inc.
>>>+# Copyright 2008 Sun Microsystems, Inc.
>>> # This file and all modifications and additions to the pristine
>>> # package are under the same license as the package itself.
>>> #
>>>@@ -11,7 +11,6 @@
>>> %define subver 2.4
>>> %define subver_install 2.0
>>> %define microver 3
>>>-%define help_version 2.4.0
>>>
>>> Name: gimp
>>> License: GPL/LGPL
>>>@@ -22,8 +21,7 @@
>>> Vendor: Sun Microsystems, Inc.
>>> Summary: The GIMP (GNU Image Manipulation Program)
>>> Source:
>>> ftp://ftp.gimp.org/pub/%{name}/v%{subver}/%{name}-%{version}.tar.bz2
>>>-Source1:
>>>ftp://ftp.gimp.org/pub/%{name}/help/gimp-help-%{help_version}.tar.bz2
>>>-Source2: %{name}-po-sun-%{po_sun_version}.tar.bz2
>>>+Source1: %{name}-po-sun-%{po_sun_version}.tar.bz2
>>> # date:2003-07-17 owner:gman type:branding
>>> Patch1: gimp-01-menu-entry.diff
>>> URL: http://www.gimp.org
>>>@@ -93,13 +91,11 @@
>>> %prep
>>> %setup -q
>>> %if %build_l10n
>>>-bzcat %SOURCE2 | tar xf -
>>>+bzcat %SOURCE1 | tar xf -
>>> cd po-sun; make; cd ..
>>> %endif
>>> %patch1 -p1
>>>
>>>-bzcat %SOURCE1 | tar xf -
>>>-
>>> %build
>>> %ifos linux
>>> if [ -x /usr/bin/getconf ]; then
>>>@@ -140,28 +136,6 @@
>>> %{print_options}
>>> make munix=
>>>
>>>-PKG_CONFIG_DISABLE_UNINSTALLED=
>>>-unset PKG_CONFIG_DISABLE_UNINSTALLED
>>>-%ifos linux
>>>-export PKG_CONFIG_PATH=/usr/src/packages/BUILD/gimp-%{subver}.%{microver}
>>>-%endif
>>>-cd gimp-help-%{help_version}
>>>- ./configure --prefix=%{_prefix} \
>>>- --sysconfdir=%{_sysconfdir} \
>>>- --bindir=%{_bindir} \
>>>- --libdir=%{_libdir} \
>>>- --includedir=%{_includedir} \
>>>- --libexecdir=%{_libexecdir} \
>>>- --localstatedir=/var/lib \
>>>- --mandir=%{_mandir} \
>>>- --enable-mp \
>>>- %{gtk_doc_option} \
>>>- --enable-default-binary \
>>>- --without-gimp \
>>>- %{print_options}
>>>- make
>>>-cd ..
>>>-
>>> %install
>>> make DESTDIR=$RPM_BUILD_ROOT install
>>> #clean up unpackaged files
>>>@@ -171,9 +145,6 @@
>>> rm $RPM_BUILD_ROOT%{_libdir}/%{name}/%{subver_install}/python/*.la
>>> #rm $RPM_BUILD_ROOT%{_libdir}/%{name}/%{subver_install}/python/*.a
>>>
>>>-cd gimp-help-%{help_version}
>>>-make DESTDIR=$RPM_BUILD_ROOT install
>>>-
>>> %clean
>>> rm -rf $RPM_BUILD_ROOT
>>>
>>>@@ -213,7 +184,6 @@
>>> %{_datadir}/gimp/%{subver_install}/scripts/
>>> %{_datadir}/gimp/%{subver_install}/themes/
>>> %{_datadir}/gimp/%{subver_install}/tips/
>>>-%{_datadir}/gimp/%{subver_install}/help/
>>> %{_datadir}/gimp/%{subver_install}/menus/
>>> %{_datadir}/applications/gimp.desktop
>>> %{_datadir}/application-registry/gimp.applications
>>>@@ -244,6 +214,8 @@
>>> %{_mandir}/man1/gimptool-%{subver_install}.1*
>>>
>>> %changelog
>>>+* Fri Jan 11 2008 - laca at sun.com
>>>+- remove help -- moved to a separate spec file and package
>>> * Wed Dec 19 2007 - brian.cameron at sun.com
>>> - Bump to 2.4.3.
>>> * Mon Dec 03 2007 - brian.cameron at sun.com
>>
>>
>
>
