rpms/xemacs/devel xemacs-21.5.28-courier-default.patch, NONE, 1.1 xemacs-21.5.28-doc-encodings.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xemacs.spec, 1.34, 1.35 xemacs-21.5.27-canna-222559.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore sources xemacs.spec 
Added Files:
	xemacs-21.5.28-courier-default.patch 
	xemacs-21.5.28-doc-encodings.patch 
Removed Files:
	xemacs-21.5.27-canna-222559.patch 
Log Message:
* Mon May 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-1
- 21.5.28, module path fix applied upstream.
- Patch to retain courier as the default font.
- Fix some corrupt characters in docs.


xemacs-21.5.28-courier-default.patch:

--- NEW FILE xemacs-21.5.28-courier-default.patch ---
--- src/faces.c	22 Apr 2007 19:58:59 -0000	1.55
+++ src/faces.c	21 May 2007 14:51:50 -0000
@@ -2397,11 +2397,12 @@
        THAT WAS A GOOD IDEA?!?!) The other fonts that used to be specified
        here gave horrendous results. */
 
+    /* Fedora change: no such issues here, back to courier for backcompat. */
     inst_list =
       Fcons 
       (Fcons
        (list1 (device_symbol), 
-	build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
+	build_string ("-*-courier-medium-r-*-*-*-120-*-*-*-*-*-*")),
        inst_list);
 
 #endif /* !USE_XFT */

xemacs-21.5.28-doc-encodings.patch:

--- NEW FILE xemacs-21.5.28-doc-encodings.patch ---
Index: man/internals/internals.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/internals/internals.texi,v
retrieving revision 1.80
diff -u -r1.80 internals.texi
--- man/internals/internals.texi	15 May 2007 10:25:16 -0000	1.80
+++ man/internals/internals.texi	21 May 2007 10:06:28 -0000
@@ -2178,8 +2178,8 @@
 rather than technical. The XEmacs maintainers would like to have issues
 resolved by examining them technically and deciding what makes the most
 sense from a technical prospective. RMS however, wants to proceed on a
-tit for tat kind of basis, which is to say, “If we support this feature
-of yours, we also get to support this other feature of mine.” The
+tit for tat kind of basis, which is to say, ``If we support this feature
+of yours, we also get to support this other feature of mine.'' The
 result of such a process is typically a big mess, because there is no
 overarching design but instead a great deal of incompatible things
 hodgepodged together.
@@ -13441,7 +13441,7 @@
 dependent on the current locale setting, which includes the locale
 code page. (For more information, see Locale-Dependent Routines.) By
 default, all locale-dependent routines in the Microsoft run-time
-library use the code page that corresponds to the ¡ë?locale. At
+library use the code page that corresponds to the locale. At
 run-time you can change or query the locale code page in use with a
 call to setlocale.
 
@@ -13453,7 +13453,7 @@
 
 -- The "C" locale is defined by ANSI to correspond to the locale in
 which C programs have traditionally executed. The code page for the 
-"C" locale (¡ë?code page) corresponds to the ASCII character
+"C" locale (code page) corresponds to the ASCII character
 set. For example, in the "C" locale, islower returns true for the
 values 0x61 ?0x7A only. In another locale, islower may return true
 for these as well as other values, as defined by that locale.
@@ -29710,7 +29710,6 @@
 --
 In order to save my hands, I am cutting back on my responses, especially
 to XEmacs-related mail.  You _will_ get a response, but please be patient.
-
 If you need an immediate response and it is not apparent in your message,
 please say so.  Thanks for your understanding.
 
@@ -30033,11 +30032,10 @@
 ben
 
 --
-In order to save my hands, I am cutting back on my responses, especially to
-XEmacs-related mail.  You
-_will_ get a response, but please be patient.  If you need an immediate
-response and it’s not apparent in
-your message, please say so.  Thanks for your understanding.
+In order to save my hands, I am cutting back on my responses, especially
+to XEmacs-related mail.  You_will_ get a response, but please be patient.
+If you need an immediate response and it's not apparent in your message,
+please say so.  Thanks for your understanding.
 
 
 
@@ -30125,11 +30123,10 @@
 ben
 
 --
-In order to save my hands, I am cutting back on my responses, especially to
-XEmacs-related mail.  You
-_will_ get a response, but please be patient.  If you need an immediate
-response and it’s not apparent in
-your message, please say so.  Thanks for your understanding.
+In order to save my hands, I am cutting back on my responses, especially
+to XEmacs-related mail.  You _will_ get a response, but please be patient.
+If you need an immediate response and it's not apparent in your message,
+please say so.  Thanks for your understanding.
 
 
 
@@ -31577,10 +31574,8 @@
 
 --
 In order to save my hands, I am cutting back on my responses, especially
-to XEmacs-related mail.  You _will_ get a response, but please be
-patient.
+to XEmacs-related mail.  You _will_ get a response, but please be patient.
 If you need an immediate response and it is not apparent in your message,
-
 please say so.  Thanks for your understanding.
 @end example
 
Index: man/lispref/ldap.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/ldap.texi,v
retrieving revision 1.3
diff -u -r1.3 ldap.texi
--- man/lispref/ldap.texi	10 Oct 2003 12:39:34 -0000	1.3
+++ man/lispref/ldap.texi	21 May 2007 10:06:28 -0000
@@ -105,7 +105,7 @@
 library XEmacs was compiled with, they may include @code{simple},
 @code{krbv41} and @code{krbv42}.
 @item base
-The base for the search. This may look like @samp{cÿ, o¬me}, see
+The base for the search. This may look like @samp{o=ACME, c=US}, see
 RFC 1779 for syntax details.
 @item scope
 One of the symbols @code{base}, @code{onelevel} or @code{subtree}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 May 2006 19:16:36 -0000	1.6
+++ .cvsignore	21 May 2007 15:16:54 -0000	1.7
@@ -1 +1 @@
-xemacs-21.5.27.tar.gz
+xemacs-21.5.28.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 May 2006 19:16:36 -0000	1.6
+++ sources	21 May 2007 15:16:54 -0000	1.7
@@ -1 +1 @@
-c415348d58eb18a9f4ed57d97e2acc62  xemacs-21.5.27.tar.gz
+12e35715c5239c63651a8189973527ab  xemacs-21.5.28.tar.gz


Index: xemacs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xemacs.spec	18 May 2007 17:20:37 -0000	1.34
+++ xemacs.spec	21 May 2007 15:16:54 -0000	1.35
@@ -18,14 +18,14 @@
 %define xver    %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
 
 Name:           xemacs
-Version:        21.5.27
-Release:        9%{?dist}
+Version:        21.5.28
+Release:        1%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
 License:        GPL
 URL:            http://www.xemacs.org/
-Source0:        ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
+Source0:        http://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
 Source1:        %{name}.png
 Source2:        xemacs.desktop
 Source3:        dotxemacs-init.el
@@ -34,13 +34,14 @@
 
 Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
-Patch2:         %{name}-21.5.27-canna-222559.patch
+Patch2:         %{name}-21.5.28-doc-encodings.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.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
 Patch7:         %{name}-21.5.27-finder-lisp-dir.patch
+Patch8:         %{name}-21.5.28-courier-default.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -190,10 +191,11 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p0
+%patch8 -p0
 
 sed -i -e 's/"lib"/"%{_lib}"/' lisp/setup-paths.el
 
-for f in man/lispref/mule.texi man/xemacs-faq.texi ; do
+for f in man/lispref/mule.texi man/xemacs-faq.texi CHANGES-beta ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
 done
 
@@ -210,7 +212,12 @@
 export CFLAGS
 export EMACSLOADPATH=$PWD/lisp:$PWD/lisp/mule
 
+# For some reason --prefix=/usr (from %%configure) results in etc and lisp
+# being installed in %{_datadir}/xemacs-%{xver} but XEmacs trying to find
+# them in /usr/{etc,lisp}, and --with-prefix=no doesn't help - upstream bug?
+# Let's just override prefix here for now to work around this.
 common_options="
+    --prefix=%{_datadir}/xemacs-%{xver}
     --with-system-packages=%{_datadir}/xemacs
     --without-msw
 %if %{with mule}
@@ -495,6 +502,11 @@
 
 
 %changelog
+* Mon May 21 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.28-1
+- 21.5.28, module path fix applied upstream.
+- Patch to retain courier as the default font.
+- Fix some corrupt characters in docs.
+
 * Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 21.5.27-9
 - Require one of the actual editor variants in -common.
 - Require -common in -el, drop duplicate dir ownerships.


--- xemacs-21.5.27-canna-222559.patch DELETED ---