rpms/w3m-el/devel w3m-el.spec,1.7,1.8

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/w3m-el/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8369

Modified Files:
	w3m-el.spec 
Log Message:
* Tue Dec 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.4.4-6
- makes it failsafe to run install-info. (#219408)


Index: w3m-el.spec
===================================================================
RCS file: /cvs/extras/rpms/w3m-el/devel/w3m-el.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- w3m-el.spec	15 Sep 2006 07:37:04 -0000	1.7
+++ w3m-el.spec	19 Dec 2006 07:57:34 -0000	1.8
@@ -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 @@
 %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 @@
 
 %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 @@
 %{_infodir}/*
 
 %changelog
+* Tue Dec 19 2006 Akira TAGOH <tagoh at redhat.com> - 1.4.4-6
+- makes it failsafe to run install-info. (#219408)
+
 * Fri Sep 15 2006 Akira TAGOH <tagoh at redhat.com> - 1.4.4-5
 - rebuilt