The alacarte patch fixes UI I18N and it was upstreamed in bugzlla.
bugster: 6493499
bugzilla: 377301
Patch: alacarte-03-g11n-i18n-ui.diff
Index: alacarte.spec
===================================================================
--- alacarte.spec (revision 10000)
+++ alacarte.spec (working copy)
@@ -24,6 +24,8 @@
Patch1: alacarte-01-force-reload.diff
#date:2006-11-15 owner:calumb bugster:6489289 bugzilla:375629 type:bug
Patch2: alacarte-02-launch-menu-item.diff
+# data:2006-12-12 owner:fujiwara bugster:6493499 bugzilla:377301 type:l10n
+Patch3: alacarte-03-g11n-i18n-ui.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -46,6 +48,7 @@
%setup -q
%patch1 -p0
%patch2 -p1
+%patch3 -p1
%build
%ifos linux
@@ -59,7 +62,7 @@
CPUS=1
fi
-glib-gettextize -f
+intltoolize -c -f --automake
libtoolize --copy --force
aclocal $ACLOCAL_FLAGS
automake -a -c -f
@@ -105,6 +108,9 @@
%{_libdir}/menu/%{name}
%changelog
+* Tue Dec 12 2006 - takao.fujiwara at sun.com
+- Added intltoollize to read LINGUAS file
+- Added alacarte-03-g11n-i18n-ui.diff
* Fri Nov 17 2006 - damien.carbery at sun.com
- Change patch2 to use p1.
* Wed Nov 15 2006 - calum.benson at sun.com
Index: Solaris/SUNWgnome-menu-editor.spec
===================================================================
--- Solaris/SUNWgnome-menu-editor.spec (revision 10000)
+++ Solaris/SUNWgnome-menu-editor.spec (working copy)
@@ -28,6 +28,14 @@
BuildRequires: SUNWgnome-python-libs-devel
BuildRequires: SUNWPython
+%if %build_l10n
+%package l10n
+Summary: %{summary} - l10n files
+SUNW_BaseDir: %{_basedir}
+%include default-depend.inc
+Requires: %{name}
+%endif
+
%prep
rm -rf %name-%version
mkdir -p %name-%version
@@ -46,6 +54,12 @@
cd %{_builddir}/%name-%version/sun-manpages
make install DESTDIR=$RPM_BUILD_ROOT
+%if %build_l10n
+%else
+# REMOVE l10n FILES
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf ${RPM_BUILD_ROOT}DISABLE
@@ -69,7 +83,17 @@
%dir %attr(0755, root, bin) %{_mandir}/man1
%{_mandir}/man1/*
+%if %build_l10n
+%files l10n
+%defattr (-, root, bin)
+%dir %attr (0755, root, sys) %{_datadir}
+%attr (-, root, other) %{_datadir}/locale
+%endif
+
%changelog
+* Thu Nov 02 2006 - takao.fujiwara at sun.com
+- Added l10n package. Fixes 6493499
+
* Fri Nov 16 2006 - damien.carbery at sun.com
- Add missing SUNWPython dependency (for /usr/bin/alacarte).
Index: Solaris/SUNWzz-gnome-l10n.spec
===================================================================
--- Solaris/SUNWzz-gnome-l10n.spec (revision 10000)
+++ Solaris/SUNWzz-gnome-l10n.spec (working copy)
@@ -58,6 +58,7 @@
BuildRequires: SUNWgnome-media-l10n
BuildRequires: SUNWgnome-media-player-l10n
BuildRequires: SUNWgnome-meeting-l10n
+BuildRequires: SUNWgnome-menu-editor-l10n
BuildRequires: SUNWgnome-panel-l10n
BuildRequires: SUNWgnome-pdf-viewer-l10n
BuildRequires: SUNWgnome-pilot-l10n
@@ -367,6 +368,7 @@
SUNWgnome-media-player-l10n
SUNWgnome-media-apps-l10n
SUNWgnome-meeting-l10n
+SUNWgnome-menu-editor-l10n
SUNWgnome-panel-l10n
SUNWgnome-pdf-viewer-l10n
SUNWgnome-pilot-l10n
@@ -1275,6 +1277,8 @@
%endif
%changelog
+* Tue Dec 12 2006 - takao.fujiwara at sun.com
+- Added SUNWgnome-menu-editor-l10n. Fixes 6493499.
* Tue Oct 31 2006 - takao.fujiwara at sun.com
- Added SUNWgksu-l10n SUNWgnome-a11y-dasher-l10n SUNWgnome-cd-l10n
SUNWgnome-keyring-manager-l10n SUNWgnome-meeting-l10n
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: alacarte-03-g11n-i18n-ui.diff
URL:
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20061212/f27473c1/attachment.ksh>
