rpms/xemacs/devel default.el,1.2,1.3 xemacs.spec,1.38,1.39

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	default.el xemacs.spec 
Log Message:
* Fri Aug 17 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-5
- Turn on syntax highlighting by default only if lazy-lock is available.
- Requires(post): coreutils in main package and -nox.
- Scriptlet cleanups.
- License: GPLv2+



Index: default.el
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/default.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.el	30 Jun 2007 11:06:10 -0000	1.2
+++ default.el	17 Aug 2007 08:31:05 -0000	1.3
@@ -15,9 +15,9 @@
 ;; use terminfo by default
 (defvar system-uses-terminfo t)
 
-;; turn on syntax highlighting by default
-(require 'font-lock)
+;; turn on syntax highlighting by default if lazy-lock is available
 (when (fboundp 'turn-on-lazy-lock)
+  (require 'font-lock)
   ;; use lazy-lock by default if lazy-shot is not enabled
   (remove-hook 'font-lock-mode-hook 'turn-on-lazy-lock)
   (add-hook 'font-lock-mode-hook


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- xemacs.spec	30 Jun 2007 11:06:10 -0000	1.38
+++ xemacs.spec	17 Aug 2007 08:31:05 -0000	1.39
@@ -20,11 +20,11 @@
 
 Name:           xemacs
 Version:        21.5.28
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
-License:        GPL
+License:        GPLv2+
 URL:            http://www.xemacs.org/
 Source0:        http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
 Source1:        %{name}.png
@@ -89,6 +89,7 @@
 Requires:       %{name}-common = %{version}-%{release}
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
 Requires:       xorg-x11-fonts-ISO8859-1-100dpi
+Requires(post): coreutils
 Provides:       xemacs(bin) = %{version}-%{release}
 
 %description
@@ -122,6 +123,7 @@
 # Note: no xemacs-packages* dependencies here, we need -nox to build the
 # base package set.
 Requires:       %{name}-common = %{version}-%{release}
+Requires(post): coreutils
 Provides:       xemacs(bin) = %{version}-%{release}
 
 %description    nox
@@ -418,15 +420,23 @@
 # rm because alternatives won't overwrite pre-alternatives symlink, bug?
 rm -f %{_bindir}/xemacs && \
 %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
-    %{_bindir}/xemacs-%{xver} 80 || :
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
-update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+    %{_bindir}/xemacs-%{xver} 80
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+update-desktop-database -q %{_datadir}/applications 2>/dev/null
+:
 
 %postun
 [ -e %{_bindir}/xemacs-%{xver} ] || \
-%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || :
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
-update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver}
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+update-desktop-database -q %{_datadir}/applications 2>/dev/null
+:
 
 %post nox
 # rm because alternatives won't overwrite pre-alternatives symlink, bug?
@@ -448,15 +458,17 @@
 
 %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
+:
 
 
 %files
@@ -529,6 +541,12 @@
 
 
 %changelog
+* Fri Aug 17 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-5
+- Turn on syntax highlighting by default only if lazy-lock is available.
+- Requires(post): coreutils in main package and -nox.
+- Scriptlet cleanups.
+- License: GPLv2+
+
 * Sat Jun 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-4
 - Turn on syntax highlighting with lazy-lock by default.
 - Drop Application and X-Fedora categories and Encoding from desktop entry.