rpms/xemacs/devel xemacs-21.4.17-utf8-fonts.patch, NONE, 1.1 xemacs.spec, 1.14, 1.15 xemacs-21.4.13-utf8-fontsets.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-serv31350

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.4.17-utf8-fonts.patch 
Removed Files:
	xemacs-21.4.13-utf8-fontsets.patch 
Log Message:
* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-6
- More modular X.Org fixes (Xauth for gnuclient, menubar font tweak).
- Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5).
- Don't ship patch backup files.


xemacs-21.4.17-utf8-fonts.patch:

--- NEW FILE xemacs-21.4.17-utf8-fonts.patch ---
--- xemacs-21.4.17/etc/Emacs.ad~	2002-12-12 08:21:12.000000000 +0200
+++ xemacs-21.4.17/etc/Emacs.ad	2005-11-27 22:46:58.000000000 +0200
@@ -198,16 +198,18 @@
 ! *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 !			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0
 !
-*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
 *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 *popup*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 			-*-*-*-*-*-*-*-120-*-iso10646-1, \
 			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
-			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0
+			-*-*-*-*-*-*-*-120-*-jisx0201.1976-0, \
+			-*-*-*-*-*-*-*-120-*-*-*
 
 ! Gui elements share this font
 !


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xemacs.spec	25 Nov 2005 15:49:34 -0000	1.14
+++ xemacs.spec	27 Nov 2005 22:34:13 -0000	1.15
@@ -8,7 +8,7 @@
 
 Name:           xemacs
 Version:        21.4.17
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -31,7 +31,7 @@
 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.13-utf8-fontsets.patch
+Patch19:        xemacs-21.4.17-utf8-fonts.patch
 Patch21:        xemacs-debian-docdir-dump.patch
 Patch23:        xemacs-no-expdyn-ia64-106744.patch
 Patch24:        xemacs-21.4.15-wnnfix-128362.patch
@@ -49,7 +49,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  desktop-file-utils
-%if !%{with mule}
+%if %{with mule}
 BuildRequires:  Canna-devel
 BuildRequires:  FreeWnn-devel
 %endif # mule
@@ -63,6 +63,7 @@
 BuildRequires:  neXtaw-devel
 %endif # xaw3d
 %endif # gtk
+BuildRequires:  libXau-devel
 # TODO: verify these build deps wrt gtk/xaw3d builds
 BuildRequires:  xorg-x11-xbitmaps
 BuildRequires:  libXaw-devel
@@ -146,7 +147,7 @@
 
 ## lisp patches ##
 
-%patch1 -p1 -b .x-paths
+%patch1 -p1
 # make find-paths.el look in datadir
 rm lisp/find-paths.elc
 %patch10 -p1
@@ -445,6 +446,11 @@
 
 
 %changelog
+* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-6
+- More modular X.Org fixes (Xauth for gnuclient, menubar font tweak).
+- Re-enable Canna and FreeWnn (bug introduced in 21.4.17-5).
+- Don't ship patch backup files.
+
 * Fri Nov 25 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-5
 - Adapt to modular X.Org.
 - Move icon to icons/hicolor and to the main package.


--- xemacs-21.4.13-utf8-fontsets.patch DELETED ---