From 56b0824a84b622a8bea77c9c3a1889fc4de7546a Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@fedoraproject.org>
Date: Mon, 23 Oct 2006 19:27:07 +0000
Subject: [PATCH 1/4] Initialize branch FC-6 for w3m-el

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..d5b6362
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+FC-6

From 4fe33ad3c7e0a4c7526be3c32d29e92bf2cb68f6 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <tagoh@fedoraproject.org>
Date: Tue, 19 Dec 2006 08:37:54 +0000
Subject: [PATCH 2/4] - makes it failsafe to run install-info. (#219408)

---
 w3m-el.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/w3m-el.spec b/w3m-el.spec
index feb1a5e..54e10b4 100644
--- a/w3m-el.spec
+++ b/w3m-el.spec
@@ -2,7 +2,7 @@
 
 Name:		w3m-el
 Version:	1.4.4
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	BSD
 URL:		http://emacs-w3m.namazu.org/
 BuildArch:	noarch
@@ -45,7 +45,8 @@ standalone pager such as lv, less, and more.
 %package common
 Summary:	Common files for W3m interface of emacsen
 Group:		Applications/Internet
-Prereq:		/sbin/install-info
+Requires(post):	/sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description common
 This package contains common files which w3m-el and w3m-el-xemacs needs.
@@ -96,16 +97,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %post common
 /sbin/install-info %{_infodir}/emacs-w3m.info \
-	%{_infodir}/dir --section="GNU Emacs Lisp"
+	%{_infodir}/dir --section="GNU Emacs Lisp" || :
 /sbin/install-info %{_infodir}/emacs-w3m-ja.info \
-	%{_infodir}/dir --section="GNU Emacs Lisp"
+	%{_infodir}/dir --section="GNU Emacs Lisp" || :
 
 %preun common
 if [ "$1" = 0 ]; then
 	/sbin/install-info --delete %{_infodir}/emacs-w3m.info \
-		%{_infodir}/dir --section="GNU Emacs Lisp"
+		%{_infodir}/dir --section="GNU Emacs Lisp" || :
 	/sbin/install-info --delete %{_infodir}/emacs-w3m-ja.info \
-		%{_infodir}/dir --section="GNU Emacs Lisp"
+		%{_infodir}/dir --section="GNU Emacs Lisp" || :
 fi
 
 %files
@@ -133,6 +134,9 @@ fi
 %{_infodir}/*
 
 %changelog
+* Tue Dec 19 2006 Akira TAGOH <tagoh@redhat.com> - 1.4.4-6
+- makes it failsafe to run install-info. (#219408)
+
 * Fri Sep 15 2006 Akira TAGOH <tagoh@redhat.com> - 1.4.4-5
 - rebuilt
 

From 266c01154ec941165a6d76c1366e9860c2191858 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:14:59 +0000
Subject: [PATCH 3/4] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1c6a66b..19cabb1 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := w3m-el
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 30beff0ad0eb6032465bbe4f78bc7eb5b41e38f4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:11:39 +0000
Subject: [PATCH 4/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 19cabb1..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: w3m-el
-# $Id$
-NAME := w3m-el
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index d5b6362..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-FC-6