rpms/emacs/devel emacs.spec,1.106,1.107 sources,1.23,1.24

[Charles Coldwell (coldwell)]

Author: coldwell

Update of /cvs/pkgs/rpms/emacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22828

Modified Files:
	emacs.spec sources 
Log Message:
* Fri Dec  7 2007 Chip Coldwell <coldwell at redhat.com> 22.1.50-3
- scriptlets shouldn't fail needlessly.
- new upstream tarball




Index: emacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- emacs.spec	6 Dec 2007 18:57:07 -0000	1.106
+++ emacs.spec	13 Dec 2007 18:36:44 -0000	1.107
@@ -3,7 +3,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 22.1.50
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -225,16 +225,16 @@
 %define info_files ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq eintr elisp0 elisp1 elisp emacs emacs-mime emacs-xtra erc eshell eudc flymake forms gnus idlwave info message mh-e newsticker org pcl-cvs pgg rcirc reftex sc ses sieve smtpmail speedbar tramp url viper vip widget woman
 
 %preun
-alternatives --remove emacs %{_bindir}/emacs-%{version}
+alternatives --remove emacs %{_bindir}/emacs-%{version} || :
 
 %posttrans
-alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80
+alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version} 80 || :
 
 %preun nox
-alternatives --remove emacs %{_bindir}/emacs-%{version}-nox
+alternatives --remove emacs %{_bindir}/emacs-%{version}-nox || :
 
 %posttrans nox
-alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70
+alternatives --install %{_bindir}/emacs emacs %{_bindir}/emacs-%{version}-nox 70 || :
 
 %post common
 for f in %{info_files}; do
@@ -242,7 +242,7 @@
 done
 
 %preun common
-alternatives --remove etags %{_bindir}/etags.emacs
+alternatives --remove etags %{_bindir}/etags.emacs || :
 if [ "$1" = 0 ]; then
   for f in %{info_files}; do
     /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir 2> /dev/null || :
@@ -292,6 +292,10 @@
 %dir %{_datadir}/emacs/%{version}
 
 %changelog
+* Fri Dec  7 2007 Chip Coldwell <coldwell at redhat.com> 22.1.50-3
+- scriptlets shouldn't fail needlessly.
+- new upstream tarball
+
 * Thu Dec  6 2007 Chip Coldwell <coldwell at redhat.com> 22.1.50-2
 - drop -DSYSTEM_PURESIZE_EXTRA=16777216 (bz409581)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/emacs/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	19 Nov 2007 22:39:44 -0000	1.23
+++ sources	13 Dec 2007 18:36:44 -0000	1.24
@@ -1,2 +1,2 @@
-5e24fb97b11d9952a0985b4ded11cbd9  emacs-22.1.50.tar.gz
+8dc74e00863f5323516c82ec6dd627db  emacs-22.1.50.tar.gz
 c4ee5e37db3921d6a9aa6d7c417ccadb  php-mode-1.2.0.tgz