rpms/xemacs-sumo/devel xemacs-sumo.spec,1.20,1.21

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs-sumo.spec 
Log Message:
*sigh*


Index: xemacs-sumo.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xemacs-sumo.spec	11 May 2006 16:34:28 -0000	1.20
+++ xemacs-sumo.spec	13 May 2006 09:15:45 -0000	1.21
@@ -1,11 +1,15 @@
 %define sumo    2006-05-10
 %define pkgdir  %{_datadir}/xemacs
 %define xemacsb xemacs-nox -batch -vanilla
-%define xemver  %(v=$(rpm -q --qf=%%{VERSION} xemacs-nox) || v=ERROR ; echo $v)
+%if "%fedora" >= "6"
+%define xemver  21.5
+%else
+%define xemver  21.4
+%endif
 
 Name:           xemacs-sumo
 Version:        %(echo %{sumo} | tr -d -)
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        XEmacs lisp packages
 
 Group:          Applications/Editors
@@ -128,7 +132,7 @@
 rmdir mule-packages/{etc,lisp,man}/skk
 
 # not needed (and unusable) with >= 21.5
-if [ "%{xemver}" '>' "21.5." ] ; then
+if [ ! "%{xemver}" '<' "21.5" ] ; then
 %{xemacsb} -l package-admin -eval \
   "(package-admin-delete-binary-package 'mule-ucs \"mule-packages\")"
 rm -rf mule-packages/{etc,lisp,man}/mule-ucs
@@ -224,6 +228,9 @@
 
 
 %changelog
+* Sat May 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060510-2
+- Try to work around build system quirks in finding the XEmacs version.
+
 * Wed May 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060510-1
 - 2006-05-10; pydoc and latin-unity patches applied upstream.
 - Adapt ispell.el to aspell >= 0.60's encoding behaviour (#190151).