Browse Source

* w3m: add ambiguous width patch (see <BTS:wishes:218>)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1908 ec354946-7b23-47d6-9f5a-488ba84defc7
shaolin 13 years ago
parent
commit
b010820f87
1 changed files with 15 additions and 1 deletions
  1. 15 1
      w/w3m/w3m-vl.spec

+ 15 - 1
w/w3m/w3m-vl.spec

@@ -1,3 +1,5 @@
+%define __perl_requires %{_rpmconfigdir}/perl.req | grep -v w3mhelp
+
 %define _docdir %{_defaultdocdir}
 
 %define cvsdate 20060815
@@ -6,7 +8,7 @@ Summary: A Pager with WWW capability
 Summary(ja): World Wide Web に対応したページャ
 Name: w3m
 Version: 0.5.2
-Release: 5%{?_dist_release}
+Release: 6%{?_dist_release}
 Group: Applications/Internet
 License: BSD
 URL: http://w3m.sourceforge.net/
@@ -16,6 +18,9 @@ Source2: w3m.csh
 Source10: w3m-term
 Source11: filter-requires-w3m.sh
 
+Patch10: w3m-0.5.2-ambwidth.patch
+Patch11: w3m-0.5.2-bugfix.patch
+
 Requires: perl, openssl >= 0.9, gc >= 6.2
 Requires(post,preun): alternatives
 Provides: webclient, pager
@@ -30,6 +35,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Vendor: Project Vine
 Distribution: Vine Linux
+Packager: shaolin
 
 # work around for [VineSeed-x86_64:00178]
 %define __find_requires %{SOURCE11}
@@ -74,6 +80,8 @@ w3m-img は X 環境のターミナルエミュレータ上の w3m でインラ
 
 %prep
 %setup -q
+%patch10 -p1
+%patch11 -p1
 find Bonus -type f | \
     xargs sed -i -e "s|/usr/local/bin/ruby|/usr/bin/ruby|g;"
 
@@ -160,6 +168,12 @@ fi
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Sun Sep 26 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.5.2-6
+- add Patch10 to fix display utf8 ambiguous width characters
+  (from: http://www.j10n.org/files/w3m-cvs-1.914-ambwidth.patch)
+- add Patch11 to fix sudden crash
+  (from: http://www.sic.med.tohoku.ac.jp/~satodai/w3m-dev/200708.month/4286.html)
+
 * Fri Feb 12 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.5.2-5
 - rebuilt with gcc-4.4.3-3 on ppc