dist-git conversion

#2781)

Makefile

@@ -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 $$/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)

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