rpms/xemacs/devel xemacs-21.5.27-finder-lisp-dir.patch, NONE, 1.1 xemacs.spec, 1.26, 1.27

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.27-finder-lisp-dir.patch 
Log Message:
* Sat Sep  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-2
- Fix build when previous revision of the same XEmacs version is installed.
- BuildRequire compface-devel instead of compface.
- Turn error checking off.
- Specfile cleanups.


xemacs-21.5.27-finder-lisp-dir.patch:

--- NEW FILE xemacs-21.5.27-finder-lisp-dir.patch ---
Index: src/Makefile.in.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/Makefile.in.in,v
retrieving revision 1.125
diff -u -u -r1.125 Makefile.in.in
--- src/Makefile.in.in	23 Apr 2006 16:11:32 -0000	1.125
+++ src/Makefile.in.in	2 Sep 2006 15:28:21 -0000
@@ -649,6 +649,7 @@
 	@echo "Building finder database ..."
 	$(RM) $(LISP)/finder-inf.el
 	$(XEMACS_BATCH)	-eval "(setq finder-compile-keywords-quiet t)" \
+		-eval "(setq lisp-directory \"$(LISP)\")" \
 		-l finder -f finder-compile-keywords
 	@echo "Building finder database ...(done)"
 


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xemacs.spec	16 May 2006 19:16:36 -0000	1.26
+++ xemacs.spec	2 Sep 2006 20:31:25 -0000	1.27
@@ -1,7 +1,6 @@
 # TODO: review desktop entry associations
 # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el
 # TODO: non-ASCII in buffer tabs
-# TODO: build issues if previous 21.5.x installed, restore finder-inf stuff?
 # TODO: fix --without modules build (../modules/canna_api.o not found?)
 
 %bcond_with     gtk
@@ -20,7 +19,7 @@
 
 Name:           xemacs
 Version:        21.5.27
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -40,6 +39,7 @@
 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
+Patch7:         %{name}-21.5.27-finder-lisp-dir.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -51,7 +51,7 @@
 BuildRequires:  pam-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libjpeg-devel
-BuildRequires:  compface
+BuildRequires:  compface-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  desktop-file-utils
@@ -178,6 +178,7 @@
 %endif
 %patch5 -p1
 %patch6 -p1
+%patch7 -p0
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
 
@@ -199,7 +200,7 @@
 CFLAGS="$CFLAGS $(pkg-config libglade --cflags)"
 %endif
 export CFLAGS
-export EMACSLOADPATH=$PWD/lisp
+export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule
 
 common_options="
     --with-system-packages=%{_datadir}/xemacs
@@ -214,6 +215,7 @@
     --without-msw
     --with-pdump
     --with-debug
+    --with-error-checking=none
     %{?with_mule:--with-mule}
 %ifarch alpha ia64 ppc64
     --with-system-malloc
@@ -232,10 +234,7 @@
     --without-canna \
     --without-wnn \
     --with-xim=no
-# toplevel smp build fails
-make %{?_smp_mflags} -C lib-src
-make %{?_smp_mflags} -C src
-EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes
+make EMACSDEBUGPATHS=yes # toplevel parallel make fails
 mv lib-src/DOC{,-nox}
 mv src/xemacs{,-nox-%{xver}}
 mv lib-src/config.values{,-nox}
@@ -264,18 +263,12 @@
     --with-xfs \
 %endif
     --with-docdir=%{_libdir}/xemacs-%{xver}/doc
-# toplevel smp build fails
-make %{?_smp_mflags} -C lib-src
-make src/Emacs.ad.h
-make %{?_smp_mflags} -C src
-EMACSLOADPATH=$PWD/lisp make # EMACSDEBUGPATHS=yes
+make EMACSDEBUGPATHS=yes # toplevel parallel make fails
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-export EMACSLOADPATH=$PWD/lisp
-
 %if %{with nox}
 # restore binaries with less dependencies; note: no -p nor move
 for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done
@@ -382,9 +375,6 @@
     %{_bindir}/xemacs-%{xver} 80 || :
 gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
 update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
-# bugfix for 21.5.26, to be removed later
-%{_sbindir}/alternatives --remove xemacs \
-    %{_bindir}/xemacs-21.5-b26 &>/dev/null || :
 
 %postun
 [ -e %{_bindir}/xemacs-%{xver} ] || \
@@ -397,9 +387,6 @@
 rm -f %{_bindir}/xemacs && \
 %{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
     %{_bindir}/xemacs-nox-%{xver} 40 || :
-# bugfix for 21.5.26, to be removed later
-%{_sbindir}/alternatives --remove xemacs \
-    %{_bindir}/xemacs-nox-21.5-b26 &>/dev/null || :
 
 %postun nox
 [ -e %{_bindir}/xemacs-nox-%{xver} ] || \
@@ -495,6 +482,12 @@
 
 
 %changelog
+* Sat Sep  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-2
+- Fix build when previous revision of the same XEmacs version is installed.
+- BuildRequire compface-devel instead of compface.
+- Turn error checking off.
+- Specfile cleanups.
+
 * Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-1
 - 21.5.27, maximize patch included upstream.
 - Drop no longer needed find-paths patch.