From 84f808864d00bd972250297dc7fc24aed692a7b9 Mon Sep 17 00:00:00 2001
From: pnemade <pnemade@fedoraproject.org>
Date: Mar 27 2007 09:48:32 +0000
Subject: Clean SPEC file and updated Source for gc


---

diff --git a/.cvsignore b/.cvsignore
index 0a19816..654bf64 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ gc6.3.tar.gz
 *.gz
 *.bz2
 *.rpm
+gc6.8.tar.gz
diff --git a/gc6.3-optflags.patch b/gc6.3-optflags.patch
new file mode 100644
index 0000000..e23939d
--- /dev/null
+++ b/gc6.3-optflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.opt	2004-07-09 08:18:29.000000000 +0900
++++ Makefile	2007-03-27 02:29:01.000000000 +0900
+@@ -30,7 +30,7 @@
+ srcdir= .
+ VPATH= $(srcdir)
+ 
+-CFLAGS= -O -I$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
++CFLAGS= -I$(srcdir)/include -DATOMIC_UNCOLLECTABLE -DNO_SIGNALS -DNO_EXECUTE_PERMISSION -DSILENT -DALL_INTERIOR_POINTERS
+ 
+ # To build the parallel collector on Linux, add to the above:
+ # -DGC_LINUX_THREADS -DPARALLEL_MARK -DTHREAD_LOCAL_ALLOC
diff --git a/sources b/sources
index 3e295df..dbe106e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 0678b72e07e69c41709d71ef0fe5da13  w3m-0.5.1.tar.gz
-8b37ee18cbeb1dfd1866958e280db871  gc6.3.tar.gz
+418d38bd9c66398386a372ec0435250e  gc6.8.tar.gz
diff --git a/w3m.spec b/w3m.spec
index 18651ca..6f2250d 100644
--- a/w3m.spec
+++ b/w3m.spec
@@ -1,10 +1,10 @@
-%define gcversion gc6.3
+%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
 
 Name:     w3m
 Version:  0.5.1
-Release:  18%{?dist}
+Release:  18.2%{?dist}
 License:  BSD
 URL:      http://w3m.sourceforge.net/
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +37,7 @@ 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
 
 Summary:  A pager with Web browsing abilities
 Group:    Applications/Internet
@@ -83,9 +84,31 @@ chmod 755 doc-jp
 
 mv %{gcversion} gc
 
+pushd gc
+%patch26 -p0
+popd
+
+pushd doc-jp
+for f in * ; do
+   case $f in
+      README.pre_form | README.tab )
+         CHARSET=ISO-2022-JP
+         ;;
+      keymap.* )
+         CHARSET=UTF-8
+         ;;
+      * )
+         CHARSET=EUC-JP
+         ;;
+    esac
+    iconv -f $CHARSET -t UTF-8 $f > $f.tmp && \
+      ( touch -r $f $f.tmp ; mv $f.tmp $f ) || rm -f $f.tmp
+done
+popd
+
 %build
 pushd gc
-make gc.a ABI_FLAG="$RPM_OPT_FLAGS"
+make gc.a CC="gcc $RPM_OPT_FLAGS"
 mkdir lib
 ln -s ../gc.a lib/libgc.a
 popd
@@ -105,12 +128,13 @@ autoconf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/w3m
 install -p -m 644 %{SOURCE10} $RPM_BUILD_ROOT%{_sysconfdir}/w3m/config
-%{!?_without_utf8:for i in $RPM_BUILD_ROOT%{_mandir}/ja/man*/*; do (if [ "x$i" = "x$i.gz" ]; then zcat $i; else cat $i; fi) | iconv -f euc-jp -t utf-8 | gzip -9c > $i.new && (rm -f $i && mv $i.new ${i//.gz}.gz || :) || rm -f $i.new; done}
+%{!?_without_utf8:for i in $RPM_BUILD_ROOT%{_mandir}/ja/man*/*; do (if [ "x$i" = "x${i%.gz}.gz" ]; then zcat $i; else cat $i; fi) | iconv -f euc-jp -t utf-8 | gzip -9c > $i.new && (rm -f $i && mv $i.new ${i//.gz}.gz || :) || rm -f $i.new; done}
+
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/w3m.1
 
 %find_lang w3m
 
@@ -137,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Tue Mar 27 2007 Parag Nemade <pnemade@redhat.com> - 0.5.1-18.2
+- more cleanup.
+
 * Mon Mar 26 2007 Parag Nemade <pnemade@redhat.com> - 0.5.1-18
 - spec file cleanup.