rpms/xemacs/devel xemacs.spec,1.9,1.10

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19950

Modified Files:
	xemacs.spec 
Log Message:
Make sure scriptlet errors won't break upgrades, add context marked deps.


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xemacs.spec	29 Jun 2005 21:42:00 -0000	1.9
+++ xemacs.spec	29 Jun 2005 21:50:34 -0000	1.10
@@ -73,7 +73,8 @@
 %package        common
 Summary:        Byte-compiled lisp files and other common files for XEmacs
 Group:          Applications/Editors
-PreReq:         %{_sbindir}/alternatives
+Requires(post): %{_sbindir}/alternatives
+Requires(preun): %{_sbindir}/alternatives
 
 %description    common
 XEmacs is a highly customizable open source text editor and
@@ -116,7 +117,8 @@
 %package        info
 Summary:        XEmacs documemtation in GNU texinfo format
 Group:          Documentation
-PreReq:         /sbin/install-info
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description    info
 XEmacs is a highly customizable open source text editor and
@@ -350,22 +352,23 @@
 update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
 
 %post common
-alternatives --install %{_bindir}/etags etags %{_bindir}/etags.xemacs 40
+%{_sbindir}/alternatives --install %{_bindir}/etags etags \
+  %{_bindir}/etags.xemacs 40 || :
 
 %preun common
-if [ $1 -eq  0 ] ; then
-  alternatives --remove etags %{_bindir}/etags.xemacs
+if [ $1 -eq 0 ] ; then
+  %{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || :
 fi
 
 %post info
 for file in xemacs cl internals lispref new-users-guide ; do
-  /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir
+  /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || :
 done
 
 %preun info
 if [ $1 -eq 0 ] ; then
   for file in xemacs cl internals lispref new-users-guide ; do
-    /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir
+    /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || :
   done
 fi
 
@@ -420,6 +423,8 @@
 - Really mark default init files as %%config.
 - Use sed instead of perl for in-place edits throughout the build.
 - Drop redundant build dependencies.
+- Make sure scriptlet errors won't break upgrades.
+- Add context marked dependencies for scriptlets.
 
 * Thu May  5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-3
 - Avoid stack corruption in open-network-stream when built with gcc4