[w3m] update to 0.5.3 upstream release

[pnemade]

commit b715d28a85ed62812e695db6eff2a9aa09d05ddf
Author: Parag Nemade <pnemade at redhat.com>
Date:   Mon Aug 8 11:22:12 2011 +0530

    update to 0.5.3 upstream release

 bug_566101_Fix-DSO-X11.patch           |   10 +++---
 gc6.3-optflags.patch                   |   11 ------
 sources                                |    2 +-
 w3m-0.5.2-fix_version_in_manpage.patch |   11 ------
 w3m-0.5.2-multilib.patch               |   12 -------
 w3m-0.5.2-nulcn.patch                  |   54 --------------------------------
 w3m.spec                               |   37 ++++++++++++---------
 7 files changed, 27 insertions(+), 110 deletions(-)
---
diff --git a/bug_566101_Fix-DSO-X11.patch b/bug_566101_Fix-DSO-X11.patch
index 4f41fc8..4449722 100644
--- a/bug_566101_Fix-DSO-X11.patch
+++ b/bug_566101_Fix-DSO-X11.patch
@@ -1,11 +1,11 @@
---- Makefile.in.old	2007-05-29 17:31:04.000000000 +0530
-+++ Makefile.in	2010-02-17 14:19:08.000000000 +0530
-@@ -193,7 +193,7 @@
+--- Makefile.in.old	2011-01-04 14:52:18.000000000 +0530
++++ Makefile.in	2011-08-08 08:56:41.515201203 +0530
+@@ -199,7 +199,7 @@
  	$(CC) $(CFLAGS) -DDUMMY -c -o $@ $?
  
  $(IMGDISPLAY): w3mimgdisplay.o $(ALIB) w3mimg/w3mimg.a
--	$(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
-+	$(CC) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS) -lX11
+-	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS)
++	$(IMGLINK) $(CFLAGS) -o $(IMGDISPLAY) w3mimgdisplay.o w3mimg/w3mimg.a $(LDFLAGS) $(LIBS) $(IMGLDFLAGS) -lX11
  
  w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
  	$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
diff --git a/sources b/sources
index 9798143..2bc85d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba06992d3207666ed1bf2dcf7c72bf58  w3m-0.5.2.tar.gz
+1b845a983a50b8dec0169ac48479eacc  w3m-0.5.3.tar.gz
diff --git a/w3m.spec b/w3m.spec
index f91ab7b..202401a 100644
--- a/w3m.spec
+++ b/w3m.spec
@@ -4,8 +4,8 @@
 %define   with_utf8 1
 
 Name:     w3m
-Version:  0.5.2
-Release:  21%{?dist}
+Version:  0.5.3
+Release:  1%{?dist}
 License:  MIT
 URL:      http://w3m.sourceforge.net/
 BuildRequires:  bzip2 findutils sed ncurses-devel
@@ -32,13 +32,10 @@ Source14:  filter-requires-w3m.sh
 ## fix patch
 Patch0:  w3m-0.4.1-helpcharset.patch
 Patch1:  w3m-0.5.1-gcc4.patch
-Patch2:  w3m-0.5.2-multilib.patch
-Patch3:  bug_555467_FTBFS.patch
-Patch4:  bug_566101_Fix-DSO-X11.patch
-Patch5:  w3m-0.5.2-nulcn.patch
-Patch6:  w3m-0.5.2-ssl_verify_server_on.patch
-Patch7:  w3m-0.5.2-fix_version_in_manpage.patch
-Patch8:  w3m-0.5.2-fix_gcc_error.patch
+Patch2:  bug_555467_FTBFS.patch
+Patch3:  bug_566101_Fix-DSO-X11.patch
+Patch4:  w3m-0.5.2-ssl_verify_server_on.patch
+Patch5:  w3m-0.5.2-fix_gcc_error.patch
 
 Summary:  A pager with Web browsing abilities
 Group:    Applications/Internet
@@ -75,13 +72,10 @@ chmod 755 doc-jp
 
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
 %patch3 -p0
-%patch4 -p0
+%patch4 -p1
 %patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%patch8 -p1
 
 %if %{with_utf8}
 pushd doc-jp
@@ -103,6 +97,15 @@ done
 popd
 %endif
 
+pushd doc
+# Convert to utf-8
+for file in README.m17n README.cookie; do
+    iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
+    touch -r $file $file.new && \
+    mv $file.new $file
+done
+popd
+
 %build
 %configure  %{build_options} \
     %{?_without_nntp:--disable-nntp} \
@@ -123,12 +126,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/w3m
 install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/w3m/config
 
 rm -f doc*/w3m.1
+rm -rf doc/CVS doc-jp/CVS
 
 %find_lang w3m
 
 
 %files -f w3m.lang
-%defattr(-, root, root, -)
 %doc NEWS
 %doc doc
 %lang(ja) %doc doc-jp
@@ -142,10 +145,12 @@ rm -f doc*/w3m.1
 %exclude %{_libexecdir}/w3m/w3mimgdisplay
 
 %files img
-%defattr(-, root, root,-)
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Mon Aug 08 2011 Parag <pnemade AT redhat DOT com> - 0.5.3-1
+- update to 0.5.3 upstream release 
+
 * Mon Jun 27 2011 Parag <pnemade AT redhat DOT com> - 0.5.2-21
 - Resolves:rh#716155-FTBFS w3m-0.5.2-20.fc15