rpms/xemacs/devel xemacs-21.5.27-no-expdyn-ia64-106744.patch, NONE, 1.1 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/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11098

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.27-no-expdyn-ia64-106744.patch 
Removed Files:
	xemacs-21.5.26-no-expdyn-ia64-106744.patch 
Log Message:
* 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-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.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/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	3 Jan 2007 22:48:26 -0000	1.32
@@ -19,7 +19,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -35,7 +35,7 @@
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.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 +43,6 @@
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  autoconf >= 2.59
 BuildRequires:  sed >= 3.95
 BuildRequires:  texinfo
 BuildRequires:  ncurses-devel
@@ -180,7 +179,9 @@
 %patch1 -p1
 %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 +193,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 +491,9 @@
 
 
 %changelog
+* 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 ---