[w3m] Resolves:rh#885940 - suggestions for further improvements

pnemade pnemade at fedoraproject.org
Fri Dec 14 11:49:22 UTC 2012 

commit 95160f907293dd4893d3908161c983893abff6ca
Author: Parag Nemade <pnemade at redhat.com>
Date:   Fri Dec 14 17:21:11 2012 +0530

    Resolves:rh#885940 - suggestions for further improvements
    
    - Drop w3m-0.4.1-helpcharset.patch as default encoding works fine
    - Drop w3m-0.5.1-gcc4.patch as compilation works fine without it

 w3m-0.4.1-helpcharset.patch                        |   24 -----
 w3m-0.5.1-gcc4.patch                               |   23 -----
 ...w3m-0.5.2-glibc2.14-fix_file_handle_error.patch |    0
 w3m.spec                                           |   89 ++++++++++++--------
 4 files changed, 53 insertions(+), 83 deletions(-)
---
diff --git a/w3m-0.5.2-fix_gcc_error.patch b/w3m-0.5.2-glibc2.14-fix_file_handle_error.patch
similarity index 100%
rename from w3m-0.5.2-fix_gcc_error.patch
rename to w3m-0.5.2-glibc2.14-fix_file_handle_error.patch
diff --git a/w3m.spec b/w3m.spec
index cea40dc..fd37c66 100644
--- a/w3m.spec
+++ b/w3m.spec
@@ -1,11 +1,15 @@
+# This is needed so that our own filter script will work
 %global _use_internal_dependency_generator 0
-%global build_options  --enable-m17n --enable-unicode --enable-nls --with-editor=/bin/vi --with-mailer="gnome-open mailto:%s" --with-browser=gnome-open --with-charset=UTF-8 --with-gc --with-termlib=ncurses
 
+# These are the build option passed to ./configure command
+%global build_options  --enable-m17n --enable-unicode --enable-nls --with-editor=/bin/vi --with-mailer="gnome-open mailto:%s" --with-browser=gnome-open --with-charset=UTF-8 --with-gc --with-termlib=ncurses --enable-nntp --enable-gopher --enable-image=x11,fb --with-imagelib=gtk2 --enable-keymap=w3m
+
+# This is for file encoding/conversions
 %global   with_utf8 1
 
 Name:     w3m
 Version:  0.5.3
-Release:  7%{?dist}
+Release:  8%{?dist}
 # UCD is added for EastAsianWidth.txt source
 License:  MIT and UCD
 URL:      http://w3m.sourceforge.net/
@@ -22,6 +26,10 @@ BuildRequires:  gc-devel
 BuildRequires:  nkf
 BuildRequires:  lynx
 
+# This is needed for perl files
+Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: perl(NKF)
+
 ## re-compressed bzip2 instead of gzip
 Source0: http://downloads.sourceforge.net/w3m/%{name}-%{version}.tar.gz
 
@@ -30,14 +38,31 @@ Source1:  w3mconfig
 Source2:  filter-requires-w3m.sh
 %global __find_requires %{SOURCE2}
 
-## fix patch
-Patch0:  %{name}-0.4.1-helpcharset.patch
-Patch1:  %{name}-0.5.1-gcc4.patch
-Patch2:  %{name}-rh555467_FTBFS.patch
-Patch3:  %{name}-rh566101_Fix-DSO-X11.patch
-Patch4:  %{name}-0.5.2-ssl_verify_server_on.patch
-Patch5:  %{name}-0.5.2-fix_gcc_error.patch
-Patch6:  %{name}-rh707994-fix-https-segfault.patch
+# Change for function call GC_get_warn_proc()
+# https://sourceforge.net/tracker/?func=detail&aid=3595876&group_id=39518&atid=425441
+Patch0:  %{name}-rh555467_FTBFS.patch
+
+# w3mimgdisplay need to be linked with -lX11 to build against gcc 4.5
+# https://sourceforge.net/tracker/?func=detail&aid=3126430&group_id=39518&atid=425441
+Patch1:  %{name}-rh566101_Fix-DSO-X11.patch
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=604864
+# verify SSL certificates by default. SSL support really is pointless
+# without doing that. Also disable use of SSLv2 by default as it's 
+# insecure, deprecated, dead since last century.
+# https://sourceforge.net/tracker/?func=detail&aid=3595801&group_id=39518&atid=425441
+Patch2:  %{name}-0.5.2-ssl_verify_server_on.patch
+
+# Now glib-2.14 owns structure name file_handle
+# https://sourceforge.net/tracker/?func=detail&aid=3595814&group_id=39518&atid=425441
+Patch3:  %{name}-0.5.2-glibc2.14-fix_file_handle_error.patch
+
+# Resolves a bug of when given following command w3m crashes
+# w3m https://www.example.coma
+# but following command works fine by giving can't load error
+# w3m http://www.example.coma
+# https://sourceforge.net/tracker/?func=detail&aid=3595167&group_id=39518&atid=425441
+Patch4:  %{name}-rh707994-fix-https-segfault.patch
 
 Summary:  A pager with Web browsing abilities
 Group:    Applications/Internet
@@ -60,7 +85,7 @@ w3m-img package as well.
 Summary: A helper program to display the inline images for w3m
 Group: Applications/Internet
 Requires: ImageMagick
-Requires: w3m = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description img
 w3m-img package provides a helper program for w3m to display the inline
@@ -72,13 +97,11 @@ linux framebuffer.
 chmod 755 doc
 chmod 755 doc-jp
 
-%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
+%patch0 -p0
+%patch1 -p0
+%patch2 -p1
+%patch3 -p1
+%patch4 -p0
 
 %if %{with_utf8}
 pushd doc-jp
@@ -110,17 +133,8 @@ done
 popd
 
 %build
-%configure  %{build_options} \
-    %{?_without_nntp:--disable-nntp} \
-    %{!?_without_nntp:--enable-nntp} \
-    %{?_without_gopher:--disable-gopher} \
-    %{!?_without_gopher:--enable-gopher} \
-    %{?_without_image:--disable-image} \
-    %{!?_without_image:--enable-image=x11,fb --with-imagelib=gtk2} \
-    %{?_with_lynx_keymap:--enable-keymap=lynx} \
-    %{!?_with_lynx_keymap:--enable-keymap=w3m}
-
-make # %{?_smp_mflags}
+%configure %{build_options}
+make %{?_smp_mflags}
 
 %install
 make install DESTDIR=%{buildroot} INSTALL="install -p"
@@ -133,10 +147,8 @@ rm -rf doc/CVS doc-jp/CVS
 
 %find_lang w3m
 
-
 %files -f w3m.lang
-%doc NEWS
-%doc doc
+%doc doc NEWS
 %lang(ja) %doc doc-jp
 %{_datadir}/w3m/
 %config(noreplace) %{_sysconfdir}/w3m/
@@ -151,6 +163,11 @@ rm -rf doc/CVS doc-jp/CVS
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Tue Dec 11 2012 Parag <pnemade AT redhat DOT com> - 0.5.3-8
+- Resolves:rh#885940 - suggestions for further improvements
+- Drop w3m-0.4.1-helpcharset.patch as default encoding works fine
+- Drop w3m-0.5.1-gcc4.patch as compilation works fine without it
+
 * Fri Dec 07 2012 Parag <pnemade AT redhat DOT com> - 0.5.3-7
 - Resolves:rh#885091 - update license tag to include UCD also
 
@@ -506,20 +523,20 @@ rm -rf doc/CVS doc-jp/CVS
 * Mon Nov 19 2001 Akira TAGOH <tagoh at redhat.com> 0.2.2-1
 - New upstream release.
 
-* Thu Aug 29 2001 SATO Satoru <ssato at redhat.com> - 0.2.1-11
+* Wed Aug 29 2001 SATO Satoru <ssato at redhat.com> - 0.2.1-11
 - made the relative link to HTML_HOME instead of the absolute one
 - fixed the permission of sources (to shut up rpmlint)
 
 * Wed Aug 29 2001 SATO Satoru <ssato at redhat.com> - 0.2.1-10
 - fixed the wrapper script (#52759)
 
-* Fri Aug  9 2001 SATO Satoru <ssato at redhat.com> - 0.2.1-9
+* Thu Aug  9 2001 SATO Satoru <ssato at redhat.com> - 0.2.1-9
 - corrected the help files' path (#51197)
 - removed /etc/profile.d/*
 - fixed and update the wrapper
 - removed imlib-devel (BuildRequires:)
 
-* Fri Aug  4 2001 SATO Satoru <ssato at redhat.com> - 0.2.1-8
+* Sat Aug  4 2001 SATO Satoru <ssato at redhat.com> - 0.2.1-8
 - disabled the inline image rendering patch by default (#50786)
 
 * Tue Jul 24 2001 SATO Satoru <ssato at redhat.com>
@@ -612,7 +629,7 @@ rm -rf doc/CVS doc-jp/CVS
 * Sat Oct 30 1999 Yoichi Imai <bonaim at mutt.freemail.ne.jp>
 - updated from 990820 to 991028
 
-* Tue Aug 26 1999 Ryo Hattori <ryoh at vs01.vaio.ne.jp>
+* Thu Aug 26 1999 Ryo Hattori <ryoh at vs01.vaio.ne.jp>
 - updated from 990716 to 990820
 
 * Wed Aug 11 1999 Ryo Hattori <ryoh at vs01.vaio.ne.jp>

More information about the scm-commits mailing list