rpms/w3m-el/FC-5 w3m-el.spec,1.3,1.4

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/w3m-el/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11703

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/FC-5/w3m-el.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- w3m-el.spec	2 Mar 2006 07:46:14 -0000	1.3
+++ w3m-el.spec	19 Dec 2006 08:40:42 -0000	1.4
@@ -2,9 +2,10 @@
 
 Name:		w3m-el
 Version:	1.4.4
-Release:	2%{?dist}
+Release:	6%{?dist}
 License:	BSD
 URL:		http://emacs-w3m.namazu.org/
+BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildPreReq:	emacs
 BuildPreReq:	xemacs >= %{xemacsver}, flim-xemacs
@@ -44,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.
@@ -70,7 +72,7 @@
 #
 %configure --with-icondir=\$\(prefix\)/share/pixmaps/w3m-el
 make
-%makeinstall
+make install prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir} infodir=$RPM_BUILD_ROOT%{_infodir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 make install-icons prefix=$RPM_BUILD_ROOT%{_prefix} datadir=$RPM_BUILD_ROOT%{_datadir}
 
@@ -95,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
@@ -132,7 +134,19 @@
 %{_infodir}/*
 
 %changelog
-* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 1.4.2-2
+* 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
+
+* Thu May 25 2006 Akira TAGOH <tagoh at redhat.com> - 1.4.4-4
+- rebuilt to be correct dist tag.
+
+* Wed May 24 2006 Akira TAGOH <tagoh at redhat.com> - 1.4.4-3
+- packaged as noarch. (#192610)
+
+* Thu Mar  2 2006 Akira TAGOH <tagoh at redhat.com> - 1.4.4-2
 - rebuilt
 
 * Mon May  9 2005 Akira TAGOH <tagoh at redhat.com> - 1.4.4-1