diff --git a/bugzilla-358333-kde-font-lock-problem.patch b/bugzilla-358333-kde-font-lock-problem.patch deleted file mode 100644 index fa5a060..0000000 --- a/bugzilla-358333-kde-font-lock-problem.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru xemacs-21.5.28.20080119.orig//lisp/font-lock.el xemacs-21.5.28.20080119/lisp/font-lock.el ---- xemacs-21.5.28.20080119.orig//lisp/font-lock.el 2007-08-18 18:33:30.000000000 +0200 -+++ xemacs-21.5.28.20080119/lisp/font-lock.el 2008-02-04 22:14:28.000000000 +0100 -@@ -959,7 +959,7 @@ - (let ((was-compiled (eq (car font-lock-keywords) t))) - ;; Bring back the user-level (uncompiled) keywords. - (if was-compiled -- (setq font-lock-keywords (cadr font-lock-keywords))) -+ (setq font-lock-keywords (cdr font-lock-keywords))) - ;; Now modify or replace them. - (if (eq how 'set) - (setq font-lock-keywords keywords) -@@ -1069,13 +1069,14 @@ - (let ((was-compiled (eq (car font-lock-keywords) t))) - ;; Bring back the user-level (uncompiled) keywords. - (if was-compiled -- (setq font-lock-keywords (cadr font-lock-keywords))) -+ (setq font-lock-keywords (cdr font-lock-keywords))) - - ;; Edit them. - (setq font-lock-keywords (copy-sequence font-lock-keywords)) - (dolist (keyword keywords) - (setq font-lock-keywords -- (delete keyword font-lock-keywords))) -+ (delete (font-lock-compile-keyword keyword) -+ (delete keyword font-lock-keywords)))) - - ;; If the keywords were compiled before, compile them again. - (if was-compiled -xemacs-21.5.28.20080119/lispだけに発見: font-lock.el.orig diff --git a/byte-comp-problem.patch b/byte-comp-problem.patch deleted file mode 100644 index f384fdd..0000000 --- a/byte-comp-problem.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru xemacs-21.5.28.20080107.orig/lisp/bytecomp.el xemacs-21.5.28.20080107/lisp/bytecomp.el ---- xemacs-21.5.28.20080107.orig/lisp/bytecomp.el 2007-12-04 21:35:31.000000000 +0100 -+++ xemacs-21.5.28.20080107/lisp/bytecomp.el 2008-01-14 17:05:42.000000000 +0100 -@@ -1888,7 +1888,8 @@ - (print-readably t) ; print #[] for bytecode, 'x for (quote x) - (print-gensym (if (and byte-compile-print-gensym - (not byte-compile-emacs19-compatibility)) -- '(t) nil))) -+ '(t) nil)) -+ print-gensym-alist) - (princ "\n" byte-compile-outbuffer) - (prin1 form byte-compile-outbuffer) - nil))) -xemacs-21.5.28.20080107/lispだけに発見: bytecomp.el~ diff --git a/ndbm.patch b/ndbm.patch index 6fa809c..1f8d01d 100644 --- a/ndbm.patch +++ b/ndbm.patch @@ -1,7 +1,7 @@ -diff -ru xemacs-21.5.20.orig/configure.ac xemacs-21.5.20/configure.ac ---- xemacs-21.5.20.orig/configure.ac 2005-03-11 12:19:01.000000000 +0100 -+++ xemacs-21.5.20/configure.ac 2005-05-13 11:41:10.000000000 +0200 -@@ -4917,8 +4917,8 @@ +diff -ru xemacs-21.5.28.20080401//configure.ac xemacs-21.5.28.20080401.new//configure.ac +--- xemacs-21.5.28.20080401//configure.ac 2008-04-01 19:40:34.000000000 +0200 ++++ xemacs-21.5.28.20080401.new//configure.ac 2008-04-02 14:21:16.000000000 +0200 +@@ -5411,8 +5411,8 @@ dnl Check for DBM support in libgdbm. if test "$enable_database_gdbm" != "no"; then @@ -9,6 +9,7 @@ diff -ru xemacs-21.5.20.orig/configure.ac xemacs-21.5.20/configure.ac - enable_database_gdbm=yes enable_database_dbm=no libdbm=-lgdbm], [ + AC_CHECK_LIB(ndbm, dbm_open, [ + enable_database_gdbm=yes enable_database_dbm=no libdbm=-lndbm], [ + AC_CHECK_LIB(gdbm_compat, dbm_open, [ + enable_database_gdbm=yes enable_database_dbm=no libdbm="-lgdbm_compat -lgdbm"], [ if test "$enable_database_gdbm" = "yes"; then - XE_DIE("Required GNU DBM support cannot be provided.") - fi +xemacs-21.5.28.20080401.new/だけに発見: configure.ac.~1~ diff --git a/xemacs-21.5.28.20080119.tar.bz2 b/xemacs-21.5.28.20080119.tar.bz2 deleted file mode 100644 index 2b8628e..0000000 --- a/xemacs-21.5.28.20080119.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dd18f9c5751b655991d55d13a1d2aa803852c86d217a50dda43f952026bdeefb -size 10213217 diff --git a/xemacs-21.5.28.20080401.tar.bz2 b/xemacs-21.5.28.20080401.tar.bz2 new file mode 100644 index 0000000..abd632d --- /dev/null +++ b/xemacs-21.5.28.20080401.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e42fb71e344da1d8493743d6667c494b17e17f6fcca4d779221248e01f5d5277 +size 10202726 diff --git a/xemacs.changes b/xemacs.changes index 35ec1ef..ba24767 100644 --- a/xemacs.changes +++ b/xemacs.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Apr 01 19:47:45 CEST 2008 - mfabian@suse.de + +- update to 21.5.28.20080401 to fix the problem reported here: + http://article.gmane.org/gmane.emacs.xemacs.beta/26999/match=zawinski+save+window+excursion+broken +- use Mercurial repository instead of CVS now. +- remove byte-comp-problem.patch, was from upstream CVS. +- remove bugzilla-358333-kde-font-lock-problem.patch, now included. +- bnc#373930: add 16 pixel Chinese font which is always installed + to the fontSet in the app-defaults to avoid that huge Chinese + fonts like cc40s.pcf.gz and cc48s.pcf.gz are matched first and + destroy the line spacing in the menus. + ------------------------------------------------------------------- Wed Mar 12 16:35:16 CET 2008 - schwab@suse.de diff --git a/xemacs.spec b/xemacs.spec index 8e03bd6..44fc83d 100644 --- a/xemacs.spec +++ b/xemacs.spec @@ -1,5 +1,5 @@ # -# spec file for package xemacs (Version 21.5.28.20080119) +# spec file for package xemacs (Version 21.5.28.20080401) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -36,8 +36,8 @@ PreReq: permissions Requires: xemacs-info xemacs-packages ctags Conflicts: gnuserv AutoReqProv: on -Version: 21.5.28.20080119 -Release: 22 +Version: 21.5.28.20080401 +Release: 1 Summary: XEmacs BuildRoot: %{_tmppath}/%{name}-%{version}-build # Howto get the cvs tree of XEmacs: @@ -53,6 +53,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # cd .. # Now make a tar.bz2 file from the contents of the "packages" directory: # tar jcvf xemacs-.tar.bz2 xemacs-/ +# +# XEmacs moved to Mercurial instad of CVS. +# See: http://xemacs.digimirror.nl/Develop/hgaccess.html +# hg clone http://hg.debian.org/hg/xemacs/xemacs-beta +# +# delete the .hg directory before creating the tarball in order +# not to make the source rpm huge. Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.bz2 Source1: xe-list.el Source2: fix-load-history.el @@ -84,11 +91,9 @@ Patch41: bugzilla-294746-set-language-unicode-precedence-list-at-startup. Patch42: build-fix-ccl-load-problem.patch Patch43: set-language-unicode-precedence-list.patch Patch45: fix-defface-custom-modified-face.patch -Patch46: byte-comp-problem.patch Patch47: xaw3d-config.patch Patch292811: bugzilla-292811-make-x-make-font-bold-italic-xft-work.patch Patch301352: bugzilla-301352-fix-wrong-incrementing-in-macros.patch -Patch358333: bugzilla-358333-kde-font-lock-problem.patch %description This is the current version of XEmacs, formerly known as Lucid-Emacs. @@ -111,6 +116,7 @@ Authors: and many other contributors %package -n xemacs-el +License: GPL v2 or later Obsoletes: xe_lisp Requires: xemacs xemacs-packages-el Summary: Emacs-Lisp source files for XEmacs @@ -133,6 +139,7 @@ Authors: and many other contributors %package -n xemacs-info +License: GPL v2 or later Obsoletes: xe_info Requires: xemacs-packages-info Summary: Info Files for XEmacs @@ -176,11 +183,9 @@ Authors: #%patch42 -p1 %patch43 -p1 %patch45 -p0 -%patch46 -p1 %patch47 %patch292811 -p1 %patch301352 -p1 -%patch358333 -p1 %patch0 -p1 find lisp/ etc/ -name '*.elc' | xargs -r rm -f %ifarch ia64 @@ -583,9 +588,19 @@ rm -rf $RPM_BUILD_ROOT %dir /usr/share/xemacs/site-packages/lisp/term/ %changelog +* Tue Apr 01 2008 mfabian@suse.de +- update to 21.5.28.20080401 to fix the problem reported here: + http://article.gmane.org/gmane.emacs.xemacs.beta/26999/match=zawinski+save+window+excursion+broken +- use Mercurial repository instead of CVS now. +- remove byte-comp-problem.patch, was from upstream CVS. +- remove bugzilla-358333-kde-font-lock-problem.patch, now included. +- bnc#373930: add 16 pixel Chinese font which is always installed + to the fontSet in the app-defaults to avoid that huge Chinese + fonts like cc40s.pcf.gz and cc48s.pcf.gz are matched first and + destroy the line spacing in the menus. * Wed Mar 12 2008 schwab@suse.de - Fix configure check for Xaw3d. -* Mon Feb 04 2008 mfabian@suse.de +* Tue Feb 05 2008 mfabian@suse.de - bnc#358333: fix bugs in font-lock-add-keywords and font-lock-remove-keywords which caused severe problems when trying to use the kde-emacs lisp files to better support editing @@ -861,7 +876,7 @@ rm -rf $RPM_BUILD_ROOT from xpdf to XEmacs. Patch by Jamie Zawinski, slighly adapted for XEmacs 21.5.18, see also: http://list-archive.xemacs.org/xemacs-beta/200407/msg00158.html -* Sun Feb 13 2005 ro@suse.de +* Mon Feb 14 2005 ro@suse.de - remove .orig file for xemacs-faq * Fri Feb 11 2005 mfabian@suse.de - improve i18n-setup in site-start.el: @@ -904,7 +919,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Sep 28 2004 werner@suse.de, mfabian@suse.de - Bugzilla #45777 (xemacs in metacity can not be maximized). - Bugzilla #46313 (mouse wheel broken in XEmacs). -* Fri Sep 24 2004 mfabian@suse.de +* Sat Sep 25 2004 mfabian@suse.de - Bugzilla #46085: move encoding setup code from func-keys.el to site-start.el and clean it up a bit. site-start.el is *always* read and it is read late enough for the encoding setup, @@ -1193,7 +1208,7 @@ rm -rf $RPM_BUILD_ROOT - remove "xemacs-21.4.4-info.tar.bz2" to save some space in the source rpm (All these info files can be rebuild from the texinfo sources in the main source tar ball "xemacs-21.4.4.tar.bz2") -* Thu Jun 07 2001 werner@suse.de +* Fri Jun 08 2001 werner@suse.de - A long way: Fix trouble with new autoconf * Thu Jun 07 2001 werner@suse.de - Make autoconf work again @@ -1316,7 +1331,7 @@ rm -rf $RPM_BUILD_ROOT - New glibc requires `with system malloc' * Thu Oct 21 1999 werner@suse.de - Last checks -* Wed Oct 20 1999 werner@suse.de +* Thu Oct 21 1999 werner@suse.de - New version 21.1.7 * avoid locale problems due to lisp formats of time e.g. - Use xemacs-mule-sumo-1999-05-27.tar.gz to avoid trouble @@ -1397,7 +1412,7 @@ rm -rf $RPM_BUILD_ROOT - Remove one change of a patch to save choosen fonts in `save options' - Add deadlock keys to x-compose.el and x-iso8859-1.el -* Sun May 25 1997 werner@suse.de +* Mon May 26 1997 werner@suse.de - New version: 19.15 - some changes in keycode under TERM=xterm (term/xterm.el) - info goes to /usr/X11R6/lib/xemacs/info/