rpms/xemacs/FC-6 xemacs-21.5.27-canna-222559.patch, NONE, 1.1 xemacs-21.5.27-no-expdyn-ia64-106744.patch, NONE, 1.1 xemacs-sitestart.el, 1.6, 1.7 xemacs.spec, 1.31, 1.32 xemacs-21.5.26-no-expdyn-ia64-106744.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/xemacs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1108

Modified Files:
	xemacs-sitestart.el xemacs.spec 
Added Files:
	xemacs-21.5.27-canna-222559.patch 
	xemacs-21.5.27-no-expdyn-ia64-106744.patch 
Removed Files:
	xemacs-21.5.26-no-expdyn-ia64-106744.patch 
Log Message:
* Wed Jan 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-8
- Fix canna_api.ell install/load paths (#222559).
- Fix site-start.el locale setup when the LANG env var is unset.

* Thu Jan  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-7
- Don't run autoconf during build.


xemacs-21.5.27-canna-222559.patch:

--- NEW FILE xemacs-21.5.27-canna-222559.patch ---
--- lisp/mule/canna-leim.el	21 Oct 2005 15:48:33 -0000	1.9
+++ lisp/mule/canna-leim.el	20 Jan 2007 12:08:13 -0000
@@ -45,7 +45,7 @@
 
 (defun canna-activate (&optional name)
   ;; XEmacs 21.5.10 and later have 3-argument require.
-  (unless (require 'CANNA "canna/canna_api" 'no-error)
+  (unless (require 'CANNA "canna_api" 'no-error)
     (error 'file-error
 	   "No Canna API support!? See M-x describe-installation & C-h v module-load-path."))
   (unless (require 'canna nil 'no-error)

xemacs-21.5.27-no-expdyn-ia64-106744.patch:

--- NEW FILE xemacs-21.5.27-no-expdyn-ia64-106744.patch ---
--- xemacs-21.5.27/aclocal.m4~	2006-03-28 18:55:49.000000000 +0300
+++ xemacs-21.5.27/aclocal.m4	2007-01-04 00:34:57.000000000 +0200
@@ -549,11 +549,12 @@
 dnl usually need to be prefix with ${wl} or some other such thing.
 dnl
 
-if test "$xe_gnu_ld" = yes; then
-  if test "$ld_shlibs" = yes; then
-    ld_dynamic_link_flags="${wl}-export-dynamic"
-  fi
-fi
+dnl dnl avoid -export-dynamic on ia64
+dnl if test "$xe_gnu_ld" = yes; then
+dnl   if test "$ld_shlibs" = yes; then
+dnl     ld_dynamic_link_flags="${wl}-export-dynamic"
+dnl   fi
+dnl fi
 
 if test -z "$ld_dynamic_link_flags"; then
   case "$xehost_os" in
--- xemacs-21.5.27/configure~	2006-05-16 07:16:04.000000000 +0300
+++ xemacs-21.5.27/configure	2007-01-04 00:34:35.000000000 +0200
@@ -21584,11 +21584,6 @@
 fi # End of if cc_produces_so = no
 
 
-if test "$xe_gnu_ld" = yes; then
-  if test "$ld_shlibs" = yes; then
-    ld_dynamic_link_flags="${wl}-export-dynamic"
-  fi
-fi
 
 if test -z "$ld_dynamic_link_flags"; then
   case "$xehost_os" in


Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-6/xemacs-sitestart.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xemacs-sitestart.el	3 Jan 2007 22:00:58 -0000	1.6
+++ xemacs-sitestart.el	25 Jan 2007 17:04:33 -0000	1.7
@@ -110,7 +110,7 @@
 
     ;; set-language-environment changes the locale; restore it.
     (setenv "LANG" locale)
-    (set-current-locale locale)
+    (set-current-locale (or locale "C"))
 
     (let* ((tmp (shell-command-to-string "locale charmap"))
            (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp)))


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-6/xemacs.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xemacs.spec	3 Jan 2007 22:00:58 -0000	1.31
+++ xemacs.spec	25 Jan 2007 17:04:33 -0000	1.32
@@ -19,7 +19,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        6%{?dist}
+Release:        8%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -34,8 +34,9 @@
 
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
+Patch2:         %{name}-21.5.27-canna-222559.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
-Patch4:         %{name}-21.5.26-no-expdyn-ia64-106744.patch
+Patch4:         %{name}-21.5.27-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
 # http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html
 Patch6:         %{name}-21.5.26-gtk-gcc4.patch
@@ -43,7 +44,6 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf >= 2.59
 BuildRequires:  sed >= 3.95
 BuildRequires:  texinfo
 BuildRequires:  ncurses-devel
@@ -178,9 +178,12 @@
 sed -i -e /tetris/d lisp/menubar-items.el
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 %patch3 -p1
 %ifarch ia64
+touch -r aclocal.m4 aclocal.m4-stamp
 %patch4 -p1
+touch -r aclocal.m4-stamp aclocal.m4
 %endif
 %patch5 -p1
 %patch6 -p1
@@ -192,9 +195,6 @@
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
 done
 
-# for patch0, patch4
-autoconf
-
 
 %build
 CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}"
@@ -493,6 +493,13 @@
 
 
 %changelog
+* Wed Jan 24 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-8
+- Fix canna_api.ell install/load paths (#222559).
+- Fix site-start.el locale setup when the LANG env var is unset.
+
+* Thu Jan  4 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-7
+- Don't run autoconf during build.
+
 * Wed Jan  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-6
 - Fix site-start.el coding system setup in non-UTF8 locales (#213582).
 - Fix "--without modules" build.


--- xemacs-21.5.26-no-expdyn-ia64-106744.patch DELETED ---