rpms/w3m/F-7 w3m-0.5.2-multilib.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 w3m.spec, 1.40, 1.41 w3m-0.5-static-libgc.patch, 1.1, NONE w3m-0.5.1-CVE-2006-6772.patch, 1.1, NONE w3m-0.5.1-mkdir_p.patch, 1.1, NONE w3m-cvs-20050328.patch, 1.1, NONE w3m-fix-vi-prec-num.patch, 1.1, NONE w3m-multilib.patch, 1.1, NONE

[Parag Nemade (pnemade)]

Author: pnemade

Update of /cvs/pkgs/rpms/w3m/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4546

Modified Files:
	.cvsignore sources w3m.spec 
Added Files:
	w3m-0.5.2-multilib.patch 
Removed Files:
	w3m-0.5-static-libgc.patch w3m-0.5.1-CVE-2006-6772.patch 
	w3m-0.5.1-mkdir_p.patch w3m-cvs-20050328.patch 
	w3m-fix-vi-prec-num.patch w3m-multilib.patch 
Log Message:
Resolves:245334 and remove upstream merged patches

w3m-0.5.2-multilib.patch:

--- NEW FILE w3m-0.5.2-multilib.patch ---
diff -ruN w3m-0.5.1.orig/acinclude.m4 w3m-0.5.1/acinclude.m4
--- w3m-0.5.1.orig/acinclude.m4	2006-03-06 18:24:38.000000000 +0900
+++ w3m-0.5.1/acinclude.m4	2006-03-06 18:27:55.000000000 +0900
@@ -394,7 +394,7 @@
 [lib=$1
  AC_MSG_CHECKING(for -l$lib)
  extlib="not found"
- for dir in /lib /usr/lib /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
+ for dir in /lib64 /lib /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib /usr/ucblib /usr/ccslib /usr/ccs/lib
  do
    if test -f $dir/lib$lib.a -o -f $dir/lib$lib.so ; then 
     LIBS="$LIBS -l$lib"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3m/F-7/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	27 Mar 2007 09:48:32 -0000	1.15
+++ .cvsignore	26 Jun 2007 04:32:26 -0000	1.16
@@ -5,3 +5,4 @@
 *.bz2
 *.rpm
 gc6.8.tar.gz
+w3m-0.5.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3m/F-7/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	27 Mar 2007 09:48:32 -0000	1.15
+++ sources	26 Jun 2007 04:32:26 -0000	1.16
@@ -1,2 +1 @@
-0678b72e07e69c41709d71ef0fe5da13  w3m-0.5.1.tar.gz
-418d38bd9c66398386a372ec0435250e  gc6.8.tar.gz
+ba06992d3207666ed1bf2dcf7c72bf58  w3m-0.5.2.tar.gz


Index: w3m.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3m/F-7/w3m.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- w3m.spec	28 Mar 2007 04:30:03 -0000	1.40
+++ w3m.spec	26 Jun 2007 04:32:26 -0000	1.41
@@ -1,12 +1,11 @@
-%define gcversion gc6.8
 %define _use_internal_dependency_generator 0
-%define  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=$RPM_BUILD_DIR/%{name}-%{version}/gc --with-termlib=ncurses
+%define  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
 
 %define   with_utf8 1
 
 Name:     w3m
-Version:  0.5.1
-Release:  19%{?dist}
+Version:  0.5.2
+Release:  1%{?dist}
 License:  MIT
 URL:      http://w3m.sourceforge.net/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,6 +18,8 @@
 %ifnarch s390 s390x
 BuildRequires:  gpm-devel
 %endif
+BuildRequires:  gc-devel
+BuildRequires:  nkf
 
 ## re-compressed bzip2 instead of gzip
 Source0: http://downloads.sourceforge.net/w3m/%{name}-%{version}.tar.gz
@@ -28,18 +29,10 @@
 Source14:  filter-requires-w3m.sh
 %define __find_requires %{SOURCE14}
 
-Source20:  http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/%{gcversion}.tar.gz
-
 ## fix patch
 Patch15:  w3m-0.4.1-helpcharset.patch
-Patch16:  w3m-0.5.1-mkdir_p.patch
-Patch17:  w3m-0.5-static-libgc.patch
 Patch21:  w3m-0.5.1-gcc4.patch
-Patch22:  w3m-cvs-20050328.patch
-Patch23:  w3m-fix-vi-prec-num.patch
-Patch24:  w3m-multilib.patch
-Patch25:  w3m-0.5.1-CVE-2006-6772.patch
-Patch26:  gc6.3-optflags.patch
+Patch24:  w3m-0.5.2-multilib.patch
 
 Summary:  A pager with Web browsing abilities
 Group:    Applications/Internet
@@ -69,26 +62,13 @@
 linux framebuffer.
 
 %prep
-%setup -q -a 20
+%setup -q
 chmod 755 doc
 chmod 755 doc-jp
 
 %patch15 -p1
-%patch16 -p1
-%patch17 -p1
 %patch21 -p1
-%patch22 -p0
-%patch23 -p1
-%ifarch ppc64 s390x sparc64 x86_64
 %patch24 -p1
-%endif
-%patch25 -p1
-
-mv %{gcversion} gc
-
-pushd gc
-%patch26 -p0
-popd
 
 %if %{with_utf8}
 pushd doc-jp
@@ -111,13 +91,6 @@
 %endif
 
 %build
-pushd gc
-make gc.a CC="gcc $RPM_OPT_FLAGS"
-mkdir lib
-ln -s ../gc.a lib/libgc.a
-popd
-aclocal
-autoconf
 %configure  %{build_options} \
     %{?_without_nntp:--disable-nntp} \
     %{!?_without_nntp:--enable-nntp} \
@@ -165,6 +138,12 @@
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Tue Jun 26 2007 Parag Nemade <pnemade at redhat.com> - 0.5.2-1
+- Update to 0.5.2 and remove merged patches.
+- Build against system gc library.
+- Add BR: nkf for multipart.cgi.
+- Don't call unneeded autotool
+
 * Tue Mar 27 2007 Parag Nemade <pnemade at redhat.com> - 0.5.1-19
 - and more cleanup.
 


--- w3m-0.5-static-libgc.patch DELETED ---


--- w3m-0.5.1-CVE-2006-6772.patch DELETED ---


--- w3m-0.5.1-mkdir_p.patch DELETED ---


--- w3m-cvs-20050328.patch DELETED ---


--- w3m-fix-vi-prec-num.patch DELETED ---


--- w3m-multilib.patch DELETED ---