rpms/xemacs/FC-5 xemacs-21.4.19-find-paths-pkgdir.patch, NONE, 1.1 xemacs.spec, 1.21, 1.22 menubar-games.patch, 1.1, NONE xemacs-21.4.10-find-paths-pkgdir.patch, 1.1, NONE xemacs-21.4.12-find-paths-libexec-lib64.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.4.19-find-paths-pkgdir.patch 
Removed Files:
	menubar-games.patch xemacs-21.4.10-find-paths-pkgdir.patch 
	xemacs-21.4.12-find-paths-libexec-lib64.patch 
Log Message:
* Fri Mar 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-4
- Build with gcc 3.2.x (#183643).
- Don't ship patch backup files.


xemacs-21.4.19-find-paths-pkgdir.patch:

--- NEW FILE xemacs-21.4.19-find-paths-pkgdir.patch ---
--- xemacs-21.4.19/lisp/find-paths.el~	2005-12-28 17:58:54.000000000 +0200
+++ xemacs-21.4.19/lisp/find-paths.el	2006-03-31 00:03:36.000000000 +0300
@@ -103,8 +103,8 @@
   (or
    ;; installed
    (paths-file-readable-directory-p (paths-construct-path (list directory
-								"lib"
-								emacs-program-name)))
+								"share"
+								(construct-emacs-version-name))))
    ;; in-place or windows-nt
    (and
     (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))
@@ -216,7 +216,7 @@
   (paths-find-emacs-directory roots
 			      (file-name-as-directory
 			       (paths-construct-path (list
-						      "lib"
+						      "share"
 						      emacs-program-name)))
 			      base
 			      envvar default


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xemacs.spec	19 Mar 2006 09:47:24 -0000	1.21
+++ xemacs.spec	4 Apr 2006 17:44:46 -0000	1.22
@@ -3,13 +3,14 @@
 %bcond_without  debug
 %bcond_without  mule
 %bcond_with     stackprot
+%bcond_without  gcc32
 
 %define pkgdir  %{_datadir}/xemacs
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
 Version:        21.4.19
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -24,10 +25,8 @@
 Source23:       dotxemacs-init.el
 Source24:       default.el
 Patch1:         xemacs-21.4.19-x-paths.patch
-Patch10:        xemacs-21.4.10-find-paths-pkgdir.patch
+Patch10:        xemacs-21.4.19-find-paths-pkgdir.patch
 Patch11:        movemail-mktemp.patch
-Patch14:        menubar-games.patch
-Patch15:        xemacs-21.4.12-find-paths-libexec-lib64.patch
 Patch16:        xemacs-21.4.12-mk-nochk-features.patch
 Patch18:        xemacs-21.4.13-dump-paths-lispdir.patch
 Patch19:        xemacs-21.4.18-utf8-fonts.patch
@@ -64,6 +63,9 @@
 %endif # xaw3d
 %endif # gtk
 BuildRequires:  xmkmf
+%if %{with gcc32}
+BuildRequires:  compat-gcc-32
+%endif
 BuildRequires:  libXau-devel
 # TODO: verify these build deps wrt gtk/xaw3d builds
 BuildRequires:  xorg-x11-xbitmaps
@@ -156,11 +158,9 @@
 # make find-paths.el look in datadir
 %patch10 -p1
 # fix "libexec" on multilib
-%ifarch x86_64 s390x
-%patch15 -p1 -b .lib64
-%endif
+sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el
 # remove game we shouldn't ship
-%patch14 -p1
+sed -i -e /tetris/d lisp/menubar-items.el
 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
 %patch18 -p1
 sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el
@@ -192,6 +192,13 @@
 CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
 CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
 %endif
+%if %{with gcc32}
+CFLAGS="$(echo $CFLAGS | sed -e 's/mtune/mcpu/')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/-mcpu=generic//')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
+export CC=gcc32
+%endif
 export CFLAGS
 
 # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir,
@@ -455,6 +462,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-4
+- Build with gcc 3.2.x (#183643).
+- Don't ship patch backup files.
+
 * Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-3
 - Build without -fstack-protector by default for now (#183643).
 


--- menubar-games.patch DELETED ---


--- xemacs-21.4.10-find-paths-pkgdir.patch DELETED ---


--- xemacs-21.4.12-find-paths-libexec-lib64.patch DELETED ---