Hi,

The attached patch fixes garbaged '--help' option on none UTF-8 locales.
bugster: 6186542
bugzilla.redhat.com: 178413
upsteamed: yes

This is a part of 6186542.
The part of goption will be fixed as bugzilla 469551 and vermillion_81.


--- spec-files/SUNWlibpopt.spec.orig    2007-12-21 20:12:17.413749000 +0900
+++ spec-files/SUNWlibpopt.spec 2007-12-21 21:11:21.979873000 +0900
@@ -19,6 +19,8 @@ Version:                 1.7
 Source:                  
ftp://ftp.mirrorservice.org/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/popt-%{version}.tar.gz
 Source1:                 %{name}-manpages-0.1.tar.gz
 Source2:                 l10n-configure.sh
+# date:2007-12-21 owner:fujiwara type:bug bugster:6186542 bugzilla:178413 
state:upstream
+Patch1:                  popt-01-g11n-i18n-stdio.diff
 SUNW_BaseDir:            %{_prefix}
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build

@@ -32,6 +34,9 @@ SUNW_BaseDir:            %{_prefix}
 %prep
 %setup -c -n %name-%version
 gzcat %SOURCE1 | tar xf -
+cd popt-%version
+%patch1 -p1
+cd ..

 %ifarch amd64 sparcv9
 cp -rp popt-%version popt-%version-64
@@ -57,6 +62,10 @@ export RPM_OPT_FLAGS
 CFLAGS="$RPM_OPT_FLAGS"
 export CFLAGS

+libtoolize -f
+aclocal $ACLOCAL_FLAGS
+autoconf
+automake -a -c -f
 ./configure $CONFLAGS                                  \
             --libdir=%{_libdir}/%{_arch64}             \
             --libexecdir=%{_libexecdir}/%{_arch64}     \
@@ -67,6 +76,10 @@ cd ..
 %endif

 cd popt-%version
+libtoolize -f
+aclocal $ACLOCAL_FLAGS
+autoconf
+automake -a -c -f
 CFLAGS="$CFLAGS32"     \
 ./configure $CONFLAGS
 make -j $CPUS
@@ -114,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* Fri Dec 21 2007 - takao.fujiwara at sun.com
+- Add popt-01-g11n-i18n-stdio.diff. Fixes '--help' option on none UTF-8.
+  CR 6186542
 * Wed Dec 19 2007 - patrick.ale at gmail.com
 - Change FTP location to ftp.mirrorservices.org.
   ftp.rpm.org does not longer seem available/to exist
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: popt-01-g11n-i18n-stdio.diff
URL: 
<http://mail.opensolaris.org/pipermail/jds-review/attachments/20071221/1bad09f3/attachment.ksh>

Reply via email to