rpms/xemacs/devel xemacs-21.5.25-find-paths-pkgdir.patch, NONE, 1.1 xemacs-21.5.25-mk-nochk-features.patch, NONE, 1.1 xemacs-21.5.25-utf8-fonts.patch, NONE, 1.1 xemacs-21.5.25-wnnfix-128362.patch, NONE, 1.1 xemacs-21.5.25-x-paths.patch, NONE, 1.1 xemacs-21.5.26-no-expdyn-ia64-106744.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xemacs-sitestart.el, 1.2, 1.3 xemacs.spec, 1.21, 1.22 delprevline.py, 1.1, NONE menubar-games.patch, 1.1, NONE movemail-mktemp.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 xemacs-21.4.12-mk-nochk-features.patch, 1.1, NONE xemacs-21.4.13-dump-paths-lispdir.patch, 1.1, NONE xemacs-21.4.15-wnnfix-128362.patch, 1.1, NONE xemacs-21.4.18-utf8-fonts.patch, 1.1, NONE xemacs-21.4.19-x-paths.patch, 1.1, NONE xemacs-debian-docdir-dump.patch, 1.1, NONE xemacs-no-expdyn-ia64-106744.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Jun 19 17:38:59 UTC 2006
- Previous message (by thread): rpms/yumex/devel sources,1.23,1.24 yumex.spec,1.24,1.25
- Next message (by thread): rpms/altermime/devel .cvsignore, 1.2, 1.3 altermime.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5548
Modified Files:
.cvsignore sources xemacs-sitestart.el xemacs.spec
Added Files:
xemacs-21.5.25-find-paths-pkgdir.patch
xemacs-21.5.25-mk-nochk-features.patch
xemacs-21.5.25-utf8-fonts.patch
xemacs-21.5.25-wnnfix-128362.patch
xemacs-21.5.25-x-paths.patch
xemacs-21.5.26-no-expdyn-ia64-106744.patch
Removed Files:
delprevline.py menubar-games.patch movemail-mktemp.patch
xemacs-21.4.10-find-paths-pkgdir.patch
xemacs-21.4.12-find-paths-libexec-lib64.patch
xemacs-21.4.12-mk-nochk-features.patch
xemacs-21.4.13-dump-paths-lispdir.patch
xemacs-21.4.15-wnnfix-128362.patch
xemacs-21.4.18-utf8-fonts.patch xemacs-21.4.19-x-paths.patch
xemacs-debian-docdir-dump.patch
xemacs-no-expdyn-ia64-106744.patch
Log Message:
* Thu Apr 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-2
- Borrow Mike Fabian's site-start.el work from the SuSE package.
* Tue Apr 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-1
- 21.5.26 (WIP).
- Make %{_bindir}/xemacs an alternative (main/nox).
- Convert some info docs to UTF-8.
* Fri Mar 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.25-1
- 21.5.25 (WIP).
- Trim pre-21.5 %changelog entries.
xemacs-21.5.25-find-paths-pkgdir.patch:
--- NEW FILE xemacs-21.5.25-find-paths-pkgdir.patch ---
--- xemacs-21.5.25/lisp/find-paths.el~ 2005-01-15 17:17:36.000000000 +0200
+++ xemacs-21.5.25/lisp/find-paths.el 2006-03-30 23:49:20.000000000 +0300
@@ -220,7 +220,7 @@
roots
(file-name-as-directory
(paths-construct-path (list
- "lib"
+ "share"
emacs-program-name)))
base
envvar default))
xemacs-21.5.25-mk-nochk-features.patch:
--- NEW FILE xemacs-21.5.25-mk-nochk-features.patch ---
--- xemacs-21.5.25/Makefile.in.in.orig 2005-12-31 14:41:23.000000000 +0200
+++ xemacs-21.5.25/Makefile.in.in 2006-03-30 23:53:48.000000000 +0300
@@ -375,7 +375,7 @@
install-only: ${MAKE_SUBDIR} check-features install-arch-dep install-arch-indep
-install: all check-features install-arch-dep install-arch-indep
+install: all install-arch-dep install-arch-indep
install-arch-dep: mkdir
for subdir in ${INSTALL_ARCH_DEP_SUBDIR}; do \
xemacs-21.5.25-utf8-fonts.patch:
--- NEW FILE xemacs-21.5.25-utf8-fonts.patch ---
--- xemacs-21.5.25/etc/Emacs.ad~ 2003-03-27 14:57:44.000000000 +0200
+++ xemacs-21.5.25/etc/Emacs.ad 2006-03-31 00:27:07.000000000 +0300
@@ -198,20 +198,22 @@
! *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
!
-Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+Emacs.gui-element.attributeFont: -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
! Font in the Motif dialog boxes.
! (Motif uses `fontList' while most other things use `font' - if you don't
@@ -227,7 +229,7 @@
! Some people use 12-point anyway because you get more text, but
! there's no purpose at all in doing this for dialog boxes.
-*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
! Dialog box translations.
! =======================
xemacs-21.5.25-wnnfix-128362.patch:
--- NEW FILE xemacs-21.5.25-wnnfix-128362.patch ---
--- xemacs-21.5.25/src/mule-wnnfns.c.orig 2004-11-05 01:06:43.000000000 +0200
+++ xemacs-21.5.25/src/mule-wnnfns.c 2006-03-31 00:20:37.000000000 +0300
@@ -318,7 +318,7 @@
Lisp_Object Qwnn_jisho, Qwnn_sbn, Qwnn_dbn_len, Qwnn_sbn_cnt, Qwnn_suuji;
Lisp_Object Qwnn_kana, Qwnn_eisuu, Qwnn_kigou, Qwnn_toji_kakko, Qwnn_fuzokogo, Qwnn_kaikakko;
Lisp_Object Vwnn_server_type;
-Lisp_Object Vcwnn_zhuyin;
+//Lisp_Object Vcwnn_zhuyin;
Lisp_Object Vwnnenv_sticky;
Lisp_Object Vwnn_uniq_level;
Fixnum lb_sisheng;
@@ -1897,9 +1897,11 @@
DEFVAR_LISP ("wnn-server-type", &Vwnn_server_type /*
*jserver, cserver ..
*/ );
- DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /*
+#if 0
+ DEFVAR_LISP ("cwnn-zhuyin", &Vcwnn_zhuyin /*
*pinyin or zhuyin
*/ );
+#endif
DEFVAR_LISP ("wnnenv-sticky", &Vwnnenv_sticky /*
*If non-nil, make environment sticky
*/ );
@@ -1908,7 +1910,7 @@
*/ );
Vwnn_server_type = Qjserver;
- Vcwnn_zhuyin = Qnil;
+ //Vcwnn_zhuyin = Qnil;
Vwnnenv_sticky = Qnil;
Vwnn_uniq_level = Qwnn_uniq;
@@ -1930,10 +1932,14 @@
case 0x80:
if (EQ(Vwnn_server_type, Qcserver))
{
+#if 0
len = cwnn_yincod_pzy (pzy, wc,
NILP (Vcwnn_zhuyin)
? CWNN_PINYIN
: CWNN_ZHUYIN);
+#else
+ len = 0;
+#endif
for (i = 0; i < len; i++)
{
if (pzy[i] & 0x80)
@@ -2036,8 +2042,12 @@
else *pin = *w;
w++; pin++;
}
+#if 0
len = cwnn_pzy_yincod (ybuf, pbuf,
NILP (Vcwnn_zhuyin) ? CWNN_PINYIN : CWNN_ZHUYIN);
+#else
+ return;
+#endif
if (len <= 0)
return;
xemacs-21.5.25-x-paths.patch:
--- NEW FILE xemacs-21.5.25-x-paths.patch ---
--- xemacs-21.5.25/etc/Emacs.ad.orig 2003-03-27 14:57:44.000000000 +0200
+++ xemacs-21.5.25/etc/Emacs.ad 2006-03-30 23:36:47.000000000 +0300
@@ -9,7 +9,7 @@
! changes to .../etc/Emacs.ad made after XEmacs has been built will have no
! effect.
!
-! However, you may copy .../etc/Emacs.ad to /usr/lib/X11/app-defaults/Emacs
+! However, you may copy .../etc/Emacs.ad to /usr/share/X11/app-defaults/Emacs
! (or whatever the standard app-defaults directory is at your site) to cause
! it to be consulted at run-time. (Do this only for site-wide customizations:
! personal customizations should be put into ~/.Xresources instead.)
--- xemacs-21.5.25/etc/xemacs.1.orig 2001-04-12 21:20:52.000000000 +0300
+++ xemacs-21.5.25/etc/xemacs.1 2006-03-30 23:36:47.000000000 +0300
@@ -293,7 +293,7 @@
Sets the color of the text.
See the file
-.I /usr/lib/X11/rgb.txt
+.I /usr/share/X11/rgb.txt
for a list of valid
color names.
.TP
xemacs-21.5.26-no-expdyn-ia64-106744.patch:
--- NEW FILE xemacs-21.5.26-no-expdyn-ia64-106744.patch ---
--- xemacs-21.5.26/aclocal.m4.orig 2006-03-28 18:55:49.000000000 +0300
+++ xemacs-21.5.26/aclocal.m4 2006-04-04 21:11:33.000000000 +0300
@@ -549,11 +549,12 @@
dnl usually need to be prefix with ${wl} or some other such thing.
dnl
-if test "$xe_gnu_ld" = yes; then
- if test "$ld_shlibs" = yes; then
- ld_dynamic_link_flags="${wl}-export-dynamic"
- fi
-fi
+dnl dnl avoid -export-dynamic on ia64
+dnl if test "$xe_gnu_ld" = yes; then
+dnl if test "$ld_shlibs" = yes; then
+dnl ld_dynamic_link_flags="${wl}-export-dynamic"
+dnl fi
+dnl fi
if test -z "$ld_dynamic_link_flags"; then
case "$xehost_os" in
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 11 Feb 2006 13:11:48 -0000 1.4
+++ .cvsignore 6 Apr 2006 16:27:53 -0000 1.5
@@ -1 +1 @@
-xemacs-21.4.19.tar.bz2
+xemacs-21.5.26.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 11 Feb 2006 13:11:48 -0000 1.4
+++ sources 6 Apr 2006 16:27:53 -0000 1.5
@@ -1 +1 @@
-0d2d255e2b362064959f329d522b137b xemacs-21.4.19.tar.bz2
+e0cd4521e8857a16f6cd675bb4c1039b xemacs-21.5.26.tar.gz
Index: xemacs-sitestart.el
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs-sitestart.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xemacs-sitestart.el 13 Dec 2005 16:06:03 -0000 1.2
+++ xemacs-sitestart.el 6 Apr 2006 16:27:53 -0000 1.3
@@ -25,41 +25,118 @@
(make-face-italic 'italic)
(make-face-italic 'bold-italic))
-;; setup coding-systems
+;; Set up language environment.setup coding-systems
(when (featurep 'mule)
- (let* ((locale (or (getenv "LC_ALL")
- (getenv "LC_CTYPE")
- (getenv "LANG")))
- (lang-region (and locale
- (substring locale 0 (min 5 (length locale)))))
- (lang (and lang-region
- (substring lang-region 0 (min 2 (length lang-region))))))
- (cond ((equal lang "ja")
- (set-language-environment "Japanese"))
- ((equal lang "ko")
- (set-language-environment "Korean"))
- ((equal lang-region "zh_CN")
- (set-language-environment "Chinese-GB"))
- ((equal lang-region "zh_TW")
- (set-language-environment "Chinese-BIG5")))
- (cond ((and locale (string-match "UTF-8" locale))
- (require 'un-define)
- (set-default-coding-systems 'utf-8)
- (set-coding-priority-list '(utf-8))
- (set-coding-category-system 'utf-8 'utf-8))
- ((equal lang "ja")
- (set-default-coding-systems 'euc-jp))
- ((equal lang "ko")
- (set-default-coding-systems 'euc-kr))
- ((equal lang-region "zh_CN")
- (set-default-coding-systems 'cn-gb-2312))
- ((equal lang-region "zh_TW")
- (set-default-coding-systems 'big5)))
- ;; register available Input Methods
- (load "leim-list")
- (when (member lang '("ja" "ko" "zh"))
- ;; ispell doesn't support CJK
- (setq-default ispell-local-dictionary "english"))))
+ (let* ((locale (getenv "LANG"))
+ (lang-region (and locale
+ (substring locale 0 (min 5 (length locale)))))
+ (lang (and lang-region
+ (substring lang-region 0 (min 2 (length lang-region))))))
+ (cond ((equal lang "af")
+ (set-language-environment "Afrikaans"))
+ ((equal lang "sq")
+ (set-language-environment "Albanian"))
+ ((equal lang "ca")
+ (set-language-environment "Catalan"))
+ ((or (equal lang-region "zh_TW") (equal lang-region "zh_HK"))
+ (set-language-environment "Chinese-BIG5"))
+ ((or (equal lang-region "zh_CN") (equal lang-region "zh_SG"))
+ (set-language-environment "Chinese-GB"))
+ ((equal lang "hr")
+ (set-language-environment "Croatian"))
+ ((equal lang "ru")
+ (set-language-environment "Cyrillic-KOI8"))
+ ((equal lang "cs")
+ (set-language-environment "Czech"))
+ ((equal lang "da")
+ (set-language-environment "Danish"))
+ ((equal lang "nl")
+ (set-language-environment "Dutch"))
+ ((equal lang "et")
+ (set-language-environment "Estonian"))
+ ((equal lang "fi")
+ (set-language-environment "Finnish"))
+ ((equal lang "fr")
+ (set-language-environment "French"))
+ ((equal lang "gl")
+ (set-language-environment "Galician"))
+ ((equal lang "de")
+ (set-language-environment "German"))
+ ((equal lang "el")
+ (set-language-environment "Greek"))
+ ((equal lang "kl")
+ (set-language-environment "Greenlandic"))
+ ((or (equal lang "he") (equal lang "iw"))
+ (set-language-environment "Hebrew"))
+ ((equal lang "hu")
+ (set-language-environment "Hungarian"))
+ ((equal lang "ga")
+ (set-language-environment "Irish"))
+ ((equal lang "it")
+ (set-language-environment "Italian"))
+ ((equal lang "ja")
+ (set-language-environment "Japanese"))
+ ((equal lang "ko")
+ (set-language-environment "Korean"))
+ ((equal lang "lt")
+ (set-language-environment "Lithuanian"))
+ ((equal lang "mt")
+ (set-language-environment "Maltese"))
+ ((or (equal lang "nb") (equal lang "nn") (equal lang "no"))
+ (set-language-environment "Norwegian"))
+ ((equal lang "pl")
+ (set-language-environment "Polish"))
+ ((equal lang "pt")
+ (set-language-environment "Portuguese"))
+ ((equal lang "ro")
+ (set-language-environment "Romanian"))
+ ((equal lang "sk")
+ (set-language-environment "Slovak"))
+ ((equal lang "sl")
+ (set-language-environment "Slovenian"))
+ ((equal lang "es")
+ (set-language-environment "Spanish"))
+ ((equal lang "sv")
+ (set-language-environment "Swedish"))
+ ((equal lang "th")
+ (set-language-environment "Thai-XTIS"))
+ ((equal lang "tr")
+ (set-language-environment "Turkish"))
+ ((equal lang "vi")
+ (set-language-environment "Vietnamese"))
+ (t
+ (set-language-environment "English")))
+
+ ;; set-language-environment changes the locale; restore it.
+ (setenv "LANG" locale)
+ (set-current-locale locale)
+
+ (let* ((tmp (shell-command-to-string "locale charmap"))
+ (tmp (substring tmp 0 (string-match "\[ \t\n\]" tmp)))
+ (tmp (intern (downcase tmp))))
+ (when (find-coding-system tmp)
+ (set-coding-priority-list (list tmp))
+ (set-coding-category-system tmp tmp)
+ (set-default-output-coding-systems tmp)
+ (set-keyboard-coding-system tmp)
+ (set-terminal-coding-system tmp)
+ (setq file-name-coding-system tmp)
+ (setq process-coding-system-alist (cons (cons ".*" tmp) '()))
+ (define-coding-system-alias 'native tmp)))
+
+ ;; Register available Input Methods.
+ (load "leim-list")
+ (when (member lang '("ja" "ko" "zh"))
+ ;; ispell doesn't support CJK
+ (setq-default ispell-local-dictionary "english"))))
+
+;; Set input mode
+;(let ((value (current-input-mode)))
+; (set-input-mode (nth 0 value)
+; (nth 1 value)
+; (terminal-coding-system)
+; ;; This quit value is optional
+; (nth 3 value)))
;; try to preserve user/group when saving files
(setq-default backup-by-copying-when-mismatch t)
Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xemacs.spec 19 Mar 2006 09:47:31 -0000 1.21
+++ xemacs.spec 6 Apr 2006 16:27:53 -0000 1.22
@@ -1,43 +1,47 @@
+# TODO: xft build option
+# TODO: site-modules vs site-lisp -> to same dir (are modules noarch?)
+# TODO: review desktop entry associations
+# TODO: split off -devel?
+# TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el
+# TODO: non-ASCII in buffer tabs
+# TODO: re-enable XFontSet support for menubars? --> see suse fontset patch
+# TODO: build issues if previous 21.5.x installed, restore finder-inf stuff?
+# TODO: gtk+ build doesn't find glade, need pkg-config libglade --cflags
+# TODO: gtk+ build fails, invalid lvalues
+
%bcond_with gtk
%bcond_with xaw3d
-%bcond_without debug
%bcond_without mule
-%bcond_with stackprot
+%bcond_without stackprot
-%define pkgdir %{_datadir}/xemacs
-%define exectop %{_libdir}/xemacs-%{version}
+%define xver %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
Name: xemacs
-Version: 21.4.19
-Release: 3%{?dist}
+Version: 21.5.26
+Release: 2%{?dist}
Summary: Different version of Emacs
Group: Applications/Editors
License: GPL
URL: http://www.xemacs.org/
-Source0: ftp://ftp.xemacs.org/xemacs-21.4/xemacs-%{version}.tar.bz2
+Source0: ftp://ftp.xemacs.org/xemacs-21.5/xemacs-%{version}.tar.gz
Source1: %{name}.png
-Source6: xemacs.desktop
-Source9: xemacs-sitestart.el
-# Used for cleaning finder-inf.el when it needs compilation
-Source22: delprevline.py
-Source23: dotxemacs-init.el
-Source24: default.el
-Patch1: xemacs-21.4.19-x-paths.patch
-Patch10: xemacs-21.4.10-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
-Patch21: xemacs-debian-docdir-dump.patch
-Patch23: xemacs-no-expdyn-ia64-106744.patch
-Patch24: xemacs-21.4.15-wnnfix-128362.patch
+Source2: xemacs.desktop
+Source3: dotxemacs-init.el
+Source4: default.el
+Source5: xemacs-sitestart.el
+
+Patch0: %{name}-21.5.25-utf8-fonts.patch
+Patch1: %{name}-21.5.25-x-paths.patch
+# TODO: patch2 still needed with --with-system-packages???
+Patch2: %{name}-21.5.25-find-paths-pkgdir.patch
+Patch3: %{name}-21.5.25-mk-nochk-features.patch
+Patch4: %{name}-21.5.26-no-expdyn-ia64-106744.patch
+Patch5: %{name}-21.5.25-wnnfix-128362.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: autoconf213
-BuildRequires: python
+BuildRequires: autoconf >= 2.59
BuildRequires: sed >= 3.95
BuildRequires: texinfo
BuildRequires: ncurses-devel
@@ -53,22 +57,25 @@
BuildRequires: Canna-devel
BuildRequires: FreeWnn-devel
%endif # mule
+
+BuildRequires: xmkmf
+BuildRequires: libXau-devel
+BuildRequires: libXpm-devel
+BuildRequires: alsa-lib-devel
+# TODO: verify this wrt gtk/xaw3d build
+BuildRequires: xorg-x11-xbitmaps
%if %{with gtk}
BuildRequires: gtk+-devel
BuildRequires: libglade-devel
%else
+# TODO: verify this wrt xaw3d
+BuildRequires: libXaw-devel
%if %{with xaw3d}
BuildRequires: Xaw3d-devel
%else
BuildRequires: neXtaw-devel
%endif # xaw3d
%endif # gtk
-BuildRequires: xmkmf
-BuildRequires: libXau-devel
-# TODO: verify these build deps wrt gtk/xaw3d builds
-BuildRequires: xorg-x11-xbitmaps
-BuildRequires: libXaw-devel
-BuildRequires: libXpm-devel
Requires: xemacs-sumo >= 20050118-2
Requires: xemacs-common = %{version}-%{release}
Requires: xorg-x11-fonts-ISO8859-1-75dpi
@@ -145,45 +152,25 @@
%prep
%setup -q
-
-f=etc/xemacs-ja.1 ; iconv -f euc-jp -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-
find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f
-
-## lisp patches ##
-
+rm -f configure.in
+sed -i -e /tetris/d lisp/menubar-items.el
+%patch0 -p1
%patch1 -p1
-# make find-paths.el look in datadir
-%patch10 -p1
-# fix "libexec" on multilib
-%ifarch x86_64 s390x
-%patch15 -p1 -b .lib64
-%endif
-# remove game we shouldn't ship
-%patch14 -p1
-# 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
-
-## non-lisp patches ##
-
-# movemail
-%patch11 -p1 -b .mkstemp
-# skip redundant check-features
-%patch16 -p1 -b .feature-chk
-# fix missing charsets warning with Xaw/UTF-8
-%patch19 -p1
-# look for dump file docdir/DUMP as well as bindir/xemacs.dmp
-%patch21 -p1 -b .docdmp
+%patch2 -p1
+sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el lisp/setup-paths.el
+%patch3 -p1
%ifarch ia64
-# don't link with -dynamic-export on ia64
-%patch23 -p1 -b .dyn-exp
+%patch4 -p1
%endif
-# remove cwnn symbols
-%patch24 -p1 -b .cwnn
+%patch5 -p1
-# patch21 touches configure.in, and patch23 touches aclocal.m4
-autoconf-2.13
+for f in man/lispref/mule.texi man/xemacs-faq.texi ; do
+ iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+done
+
+# for patch0, patch4
+autoconf
%build
@@ -193,73 +180,63 @@
CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
%endif
export CFLAGS
+export EMACSLOADPATH=$PWD/lisp
-# XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir,
-# --includedir, --libexecdir, --localstatedir, --sharedstatedir
-# note: datadir has to be defined because it defaults to /usr/lib
common_options="
- %{_target_platform}
- --prefix=%{_prefix}
- --datadir=%{_datadir}
- --infodir=%{_infodir}
- --libdir=%{_libdir}
- --mandir=%{_mandir}/man1
- --with-gpm=yes
- --with-pop
- --mail-locking=lockf
- --with-clash-detection
- --with-database=no
- --with-postgresql=no
- --with-ldap=no
- --with-hesiod=no
- --with-msw=no
- --pdump
- --debug=%{?with_debug:yes}%{!?with_debug:no}
- %{?with_mule:--with-mule=yes}
+ --with-system-packages=%{_datadir}/xemacs
+ --with-gpm
+ --with-pop
+ --with-mail-locking=lockf
+ --with-clash-detection
+ --with-database=no
+ --without-postgresql
+ --without-ldap
+ --without-hesiod
+ --without-msw
+ --with-pdump
+ --with-debug
+ %{?with_mule:--with-mule}
%ifarch alpha ia64 ppc64
- --with-system-malloc
+ --with-system-malloc
%endif
%ifarch ia64
- --without-modules
+ --without-modules
%endif
"
# build without X
-# note: docdir requires trailing slash
-./configure $common_options \
- --docdir=%{exectop}/doc-nox/ \
- --with-sound=no \
- --with-x11=no \
- --with-canna=no \
- --with-wnn=no \
- --with-xim=no
+# note: docdir requires trailing slash # TODO: still in 21.5?
+%configure $common_options \
+ --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox/ \
+ --with-sound=none \
+ --without-x \
+ --without-canna \
+ --without-wnn \
+ --with-xim=no
# 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
mv lib-src/DOC{,-nox}
-mv src/xemacs{,-nox-%{version}}
-mv src/{xemacs.dmp,DUMP-nox}
+mv src/xemacs{,-nox-%{xver}}
mv lib-src/config.values{,-nox}
# build with X
-# note: docdir requires trailing slash
-./configure $common_options \
- --docdir=%{exectop}/doc/ \
- --with-sound=native \
- --with-xim=xlib \
+# note: docdir requires trailing slash # TODO: still in 21.5?
+%configure $common_options \
+ --with-docdir=%{_libdir}/xemacs-%{xver}/doc/ \
%if %{with gtk}
- --with-gtk \
- --with-gnome \
+ --with-gtk \
+ --with-gnome \
%else
- --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \
- --with-widgets=athena \
- --with-menubars=lucid \
- --with-scrollbars=lucid \
- --with-dialogs=athena \
+ --with-xim=xlib \
+ --with-athena=%{?with_xaw3d:3d}%{!?with_xaw3d:next} \
+ --with-widgets=athena \
+ --with-menubars=lucid \
+ --with-scrollbars=lucid \
+ --with-dialogs=athena \
%endif
- --with-xfs=no
+ --without-xfs
# toplevel smp build fails
make %{?_smp_mflags} -C lib-src
make src/Emacs.ad.h
@@ -270,29 +247,23 @@
%install
rm -rf $RPM_BUILD_ROOT
-# adjust mandir
export EMACSLOADPATH=$PWD/lisp
-install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc
-# note: no DESTDIR support, docdir requires trailing slash
+# note: no DESTDIR support
+# note: docdir requires trailing slash # TODO: still in 21.5?
%makeinstall \
- mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
- docdir=$RPM_BUILD_ROOT%{exectop}/doc/
-install -Dpm 644 etc/xemacs-ja.1 $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs.1
+ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
+ docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc/
echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
-echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/ja/man1/xemacs-nox.1
# install nox files
-install -pm 755 src/xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir}
-ln -s xemacs-nox-%{version} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox
-install -dm 755 $RPM_BUILD_ROOT%{exectop}/doc-nox
-install -pm 644 src/DUMP-nox $RPM_BUILD_ROOT%{exectop}/doc-nox/DUMP
-install -pm 644 lib-src/DOC-nox $RPM_BUILD_ROOT%{exectop}/doc-nox/DOC
+install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}
+ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox
+install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox
+install -pm 644 lib-src/DOC-nox \
+ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC
install -pm 644 lib-src/config.values-nox \
- $RPM_BUILD_ROOT%{exectop}/doc-nox/config.values
-
-mv $RPM_BUILD_ROOT%{_bindir}/xemacs-%{version}-*.dmp \
- $RPM_BUILD_ROOT%{exectop}/doc/DUMP
+ $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values
# these clash with GNU Emacs
mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs}
@@ -307,44 +278,39 @@
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
desktop-file-install \
- --vendor=fedora \
- --mode=644 \
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category=X-Fedora \
- %{SOURCE6}
+ --vendor=fedora \
+ --mode=644 \
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-category=X-Fedora \
+ %{SOURCE2}
# lockdir
install -dm 1777 $RPM_BUILD_ROOT%{_localstatedir}/lock/xemacs
# site-start.el
-install -dm 755 $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp/site-start.d
-install -pm 644 %{SOURCE9} \
- $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp/site-start.el
+install -dm 755 \
+ $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d
+install -pm 644 %{SOURCE5} \
+ $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.el
# default.el
-install -pm 644 %{SOURCE24} $RPM_BUILD_ROOT%{pkgdir}/site-packages/lisp
+install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp
# default user init file
-install -Dpm 644 %{SOURCE23} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el
+install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/skel/.xemacs/init.el
# icon
install -Dpm 644 %{SOURCE1} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
# make sure nothing is 0400
chmod -R a+rX $RPM_BUILD_ROOT%{_prefix}
-# filter out buildroot from finder-inf.el
-sed -i -e "s|$RPM_BUILD_ROOT||" \
- $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el
-[ -x %{_bindir}/xemacs ] && \
- python %{SOURCE22} \
- $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/lisp/finder-inf.el
-
-# clean up "junk" (TODO: there's much more!)
-cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version}/etc
-rm -r aliases.ksh BETA *.sh CODING-STANDARDS InstallGuide \
- sparcworks tests XKeysymDB *.sco *.1
+# clean up unneeded stuff (TODO: there's probably much more)
+find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm
+rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh
+cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc
+rm -r InstallGuide sparcworks tests XKeysymDB *.sco *.1
cd -
# separate files
@@ -353,7 +319,7 @@
echo "%%defattr(-,root,root,-)" > el-files
echo "%%defattr(-,root,root,-)" > info-files
-find $RPM_BUILD_ROOT%{_datadir}/xemacs-%{version} $RPM_BUILD_ROOT%{pkgdir} \
+find $RPM_BUILD_ROOT{%{_datadir}/xemacs-%{xver},%{_datadir}/xemacs} \
\( -type f -not -name '*.el' -fprint base-non-el.files \) -o \
\( -type d -name info -fprint info.files -prune \) -o \
\( -type d -fprintf dir.files "%%%%dir %%p\n" \) -o \
@@ -376,43 +342,58 @@
%post
+# rm because alternatives won't overwrite pre-alternatives symlink, bug?
+rm -f %{_bindir}/xemacs && \
+%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
+ %{_bindir}/xemacs-%{xver} 80 || :
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
%postun
+[ $1 -ne 0 ] || \
+%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-%{xver} || :
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || :
update-desktop-database -q %{_datadir}/applications 2>/dev/null || :
+%post nox
+# rm because alternatives won't overwrite pre-alternatives symlink, bug?
+rm -f %{_bindir}/xemacs && \
+%{_sbindir}/alternatives --install %{_bindir}/xemacs xemacs \
+ %{_bindir}/xemacs-nox-%{xver} 40 || :
+
+%postun nox
+[ $1 -ne 0 ] || \
+%{_sbindir}/alternatives --remove xemacs %{_bindir}/xemacs-nox-%{xver} || :
+
%post common
%{_sbindir}/alternatives --install %{_bindir}/etags etags \
- %{_bindir}/etags.xemacs 40 || :
+ %{_bindir}/etags.xemacs 40 || :
%preun common
-if [ $1 -eq 0 ] ; then
- %{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || :
-fi
+[ $1 -ne 0 ] || \
+%{_sbindir}/alternatives --remove etags %{_bindir}/etags.xemacs || :
%post info
for file in xemacs cl internals lispref new-users-guide ; do
- /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || :
+ /sbin/install-info %{_infodir}/$file.info %{_infodir}/dir || :
done
%preun info
if [ $1 -eq 0 ] ; then
- for file in xemacs cl internals lispref new-users-guide ; do
- /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || :
- done
+ for file in xemacs cl internals lispref new-users-guide ; do
+ /sbin/install-info --delete %{_infodir}/$file.info %{_infodir}/dir || :
+ done
fi
%files
%defattr(-,root,root,-)
-%{_bindir}/xemacs
-%{_bindir}/xemacs-%{version}
+%ghost %{_bindir}/xemacs
+%{_bindir}/xemacs-%{xver}
# gnuclient, gnuserv need X libs, so not in -common
%{_bindir}/gnuclient
-%{exectop}/*linux/gnuserv
-%{exectop}/doc/
+%{_libdir}/xemacs-%{xver}/*linux/gnuserv
+%{_libdir}/xemacs-%{xver}/doc/
%{_datadir}/applications/*-%{name}.desktop
%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
%{_mandir}/man1/gnuclient.1*
@@ -420,30 +401,29 @@
%files nox
%defattr(-,root,root,-)
+%ghost %{_bindir}/xemacs
%{_bindir}/xemacs-nox
-%{_bindir}/xemacs-nox-%{version}
-%{exectop}/doc-nox/
+%{_bindir}/xemacs-nox-%{xver}
+%{_libdir}/xemacs-%{xver}/doc-nox/
%files common -f base-files
%defattr(-,root,root,-)
-%doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
-%doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL
+%doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL
%doc etc/editclient.sh
%{_bindir}/ellcc
%{_bindir}/etags.xemacs
%{_bindir}/gnuattach
%{_bindir}/gnudoit
%{_bindir}/ootags
-%dir %{exectop}/
-%dir %{exectop}/*linux/
-%{exectop}/*linux/[acdfhimprsvwy]*
-%{exectop}/*linux/gzip-el.sh
+%{_libdir}/xemacs/
+%dir %{_libdir}/xemacs-%{xver}
+%dir %{_libdir}/xemacs-%{xver}/*linux/
+%{_libdir}/xemacs-%{xver}/*linux/[acdfhimprsvwy]*
%config(noreplace) %{_sysconfdir}/skel/.xemacs/
%{_mandir}/man1/etags.xemacs.1*
%{_mandir}/man1/gnuattach.1*
%{_mandir}/man1/gnudoit.1*
%{_mandir}/man1/xemacs*.1*
-%lang(ja) %{_mandir}/ja/man1/xemacs*.1*
%dir %{_localstatedir}/lock/xemacs/
%files el -f el-files
@@ -455,492 +435,14 @@
%changelog
-* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-3
-- Build without -fstack-protector by default for now (#183643).
-
-* Thu Feb 2 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-2
-- 21.4.19, X paths patch mostly applied upstream.
-
-* Tue Dec 13 2005 Ville Skyttä <ville.skytta at iki.fi>
-- Don't set Info-directory-list in site-start.el to fix honoring INFOPATH
- from the environment (Geert Kloosterman).
-
-* Mon Dec 5 2005 Ville Skyttä <ville.skytta at iki.fi>
-- Fix typo in -info summary.
-- Point to main man page for xemacs-nox.
-
-* Sun Dec 4 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.18-2
-- 21.4.18, innerbuf and cursor patches applied upstream.
-
-* Wed Nov 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-7
-- Require ISO-8859-1 fonts (Alexandre Oliva, #174617).
-- Make popup dialog font the intended one even without ISO-8859 fonts.
-- BuildRequire xmkmf to get X defines during build.
-- Move editclient.sh to docs.
-
-* 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.
-- Move man pages to subpackages where the things they document are,
- install a few more of them.
-- Mark config files as noreplace.
-- Drop no longer needed obsoletions.
-- Start cleaning up unneeded files.
-- Don't use %%exclude.
-- Use %%bcond_with*.
-
-* Thu Jun 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-4
-- Improve package summaries and descriptions, reformat/clean up specfile.
-- Bring back Wnn support.
-- Fine tune dependencies and options of "--without mule" builds.
-- Use desktop-file-install for installing the desktop entry, fix up X-*
- categories, update desktop database at post (un)install time.
-- Really mark default init files as %%config.
-- Use sed instead of perl for in-place edits throughout the build.
-- Drop redundant build dependencies.
-- Make sure scriptlet errors won't break upgrades.
-- Add context marked dependencies for scriptlets.
-- Build with -fno-strict-aliasing per upstream recommendations.
-- Use neXtaw by default, rebuild with "--with xaw3d" to get Xaw3d.
-- Don't own %%{_bindir} in -common.
-
-* Thu May 5 2005 Ville Skyttä <ville.skytta at iki.fi> - 21.4.17-3
-- Avoid stack corruption in open-network-stream when built with gcc4
- (Enrico Scholz, #154112).
-
-* Tue Mar 1 2005 Ville Skyttä <scop at xemacs.org> - 21.4.17-2
-- Drop xemacs-sumo build dependency and -nox install time dependency on it
- to solve chicken-egg bootstrap problem.
-- Include X-Face support.
-- Include Glade support when built with GTK.
-- Include prettier icon, based on upstream xemacs.xpm.
-- Drop FreeWnn-devel build dependency.
-- Drop main package dependency from -info.
-- Require updated -sumo.
-- Avoid shipping patch backups.
-- Improve package summaries and descriptions.
-- Trim pre-XEmacs-21.4 %%changelog entries.
-- Some specfile maintainablity improvements and cleanups.
-
-* Fri Feb 25 2005 Jens Petersen <petersen at redhat.com>
-- use PreReq not Requires(post,preun) for install and uninstall script
- requirements (Axel Thimm, 147791)
-- use sed instead of perl to fixup filelists
-
-* Mon Feb 7 2005 Jens Petersen <petersen at redhat.com> - 21.4.17-1
-- update to 21.4.17
- - fixes movemail format string vulnerability (CAN-2005-0100, 146705)
- - xemacs-21.4.16-xutil-keysym-144601.patch no longer needed
-
-* Tue Jan 25 2005 Jens Petersen <petersen at redhat.com> - 21.4.16-2
-- workaround xorg-x11 issue with iso-level3-shift (Ville Skyttä, 144601)
- - add xemacs-21.4.16-xutil-keysym-144601.patch
-
-* Mon Dec 13 2004 Jens Petersen <petersen at redhat.com> - 21.4.16-1
-- update to new stable release
- - no longer need configure-ppc-ldscript.patch and
- xemacs-21.4.15-pui-120437.patch
-- default to unified diff in .xemacs/init.el
-
-* Thu Nov 18 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-10
-- show xemacs again in the desktop menu (132567)
-
-* Mon Oct 18 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-9
-- fix etag alternatives removal when uninstalling (Karsten Hopp, 136137)
-
-* Wed Oct 6 2004 Jens Petersen <petersen at redhat.com>
-- xemacs-el no longer requires xemacs for -nox users
- (Lars Hupfeldt Nielsen, 134479)
-
-* Thu Sep 30 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-8
-- cleanup and update .desktop file
-- make xemacs not appear in the desktop menu (Seth Nickell,132567)
-- move the desktop file from -common to main package
-- etags is now handled by alternatives (92256)
-- no longer require ctags
-- turn back on wnn support and add xemacs-21.4.15-wnnfix-128362.patch
- (Yukihiro Nakai, 128362)
-
-* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Mon Jun 7 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-6
-- don't link with -export-dynamic on ia64 to stop dumped function pointers from
- breaking (Roland McGrath & Jakub Jelinek, #106744)
-- disable dynamic module support on ia64
-- change the xemacs-info uninstall script from %%postun to %%preun and move
- the post/preun install-info requires to xemacs-info
-- simplify coding-system setup somewhat in site-start.el
-- fix up the desktop file (Ville Skyttä, 123135)
-- xemacs-nox now requires xemacs-sumo
-- build without xfs since it seems to cause some problem with fonts missing
-
-* Wed May 5 2004 Jens Petersen <petersen at redhat.com>
-- move install-info requirement to xemacs-info
-- drop unnecessary Canna-libs requirement
-
-* Fri Apr 9 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-5
-- add xemacs-21.4.15-pui-120437.patch to fix pui problems in 21.4.15
- (Ville Skyttä)
-- buildrequire gpm-devel and build xemacs-nox with gpm (Ville Skyttä,120437)
-- separate patches into lisp and non-lisp patches
-- move gnuclient and gnuserv from xemacs-common to xemacs since they
- require X libs (Ville Skyttä,110649)
-
-* Wed Apr 7 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-4
-- add xemacs-nox subpackage (Jamie Zawinski, #110649) and xemacs-common
- - add xemacs-debian-docdir-dump.patch and put dump files in docdir
- - xemacs and xemacs-nox require xemacs-common
- - define exectop and use it
- - one configure and build for xemacs-nox and one for xemacs
-- update package descriptions
-- don't create backup of patched Emacs.ad since it gets installed, and
- drop Canna-devel version requirement (Ville Skyttä, #115270)
-- default ispell dictionary to english for CJK locale, since aspell doesn't
- support widechars (#103145)
-- rebuild against latest Canna built with xorg-x11 xmkmf (Kaj Niemi, #119562)
-- simplify coding-system setup
-- enable gpm for xemacs package
-
-* Tue Mar 16 2004 Mike A. Harris <mharris at redhat.com> 21.4.15-3
-- Removed bogus Requires: XFree86-libs, and other similar library runtime
- dependancies, because rpm find-requires automatically puts dependancy info
- in the binary rpms which are on the .so files rather than a specific
- package. The XFree86-libs removal is necessary in order to replace XFree86
- with xorg-x11 in an X11 implementation agnostic fashion. (#118483)
-- Changed "Requires(post,preun): info" dependancy to
- "Requires(post,postun): /sbin/install-info"
-
-* Tue Mar 02 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
-- rebuilt
-
-* Thu Feb 5 2004 Jens Petersen <petersen at redhat.com> - 21.4.15-1
-- update to 21.4.15
-- improve language and coding-system startup in site-start.el like
- lang-coding-systems-init.el in emacs package
-- build without wnn support
-- drop xemacs-21.4.13-regexp-stack-overflow-107402.patch
-
-* Sat Dec 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-6
-- set EMACSLOADPATH during final make and install so that it is buildable
- even when xemacs isn't installed
-- disable ldap, postgresql and dbm support for now (#110649) [jwz]
-
-* Sat Dec 13 2003 Jeff Johnson <jbj at jbj.org>
-- rebuild against db-4.2.52.
-
-* Fri Nov 7 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-5
-- add a "--without mule" rpmbuild option for the 8bit dead-hards (#102718)
- which disables mule and Input Method support
-- only load un-define in site-start.el when there is mule support
-
-* Thu Nov 6 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-4
-- increase regexp re_max_failures to 40000 in
- xemacs-21.4.13-regexp-stack-overflow-107402.patch (#107402) [Rik Faith]
-
-* Mon Oct 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-3
-- no longer obsolete xemacs-sumo-el for xemacs-el [thanks to Axel Thimm]
-- fix "Stack overflow in regexp matcher" (#107402) [reported by Rik Faith,
- patch by Stephen J. Turnbull]
-
-* Fri Oct 17 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-2
-- require Canna-libs not Canna
-- move CJK X resource files to xemacs-sumo
-- no longer need to define ispell program to be aspell
-
-* Thu Sep 25 2003 Jeff Johnson <jbj at jbj.org> - 21.4.14-1.1
-- rebuild against db-4.2.42.
-
-* Mon Sep 8 2003 Jens Petersen <petersen at redhat.com> - 21.4.14-1
-- update to 21.4.14
-- default require-final-newline to t in site-start.el (#102022)
-
-* Tue Sep 2 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-5
-- default require-final-newline to ask in site-start.el
- and remove redundant setting of next-line-add-newlines to nil in default.el
- (#102022) [reported by Ville Skyttä]
-
-* Mon Jul 14 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-4
-- build with --debug=yes by default (suggested by Ville Skyttä)
-
-* Sun Jul 13 2003 Ville Skyttä <scop at xemacs.org>
-- add xemacs-21.4.13-utf8-fontsets.patch to eliminate warning about missing
- charsets in utf-8 locale with Xaw
-- motif-specific xemacs-21.4.13-EmacsFrame-fontlock.patch no longer needed
-
-* Fri Jun 27 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-3
-- add xemacs-21.4.13-dump-paths-lispdir.patch, so that the source lisp files
- get re-bytecompiled and dumped, not the installed ones
-- use Athena/Xaw3d instead of motif for dialogs and widgets
-- buildrequirements fixes
-- use _localstatedir
-
-* Sat May 31 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-2
-- add xemacs-21.4.13-EmacsFrame-fontlock.patch to stop font-lock being
- very slow (Ville Skyttä)
-
-* Fri May 30 2003 Ville Skyttä <scop at xemacs.org>
-- Use upstream icon in desktop entry, add missing semicolon to Categories.
-- Have backup-by-copying-when-mismatch default to true in site-start.el.
-- Mark init files as %%config.
-
-* Thu May 29 2003 Jens Petersen <petersen at redhat.com> - 21.4.13-1
-- update to 21.4.13
- - rcs2log-update.patch no longer needed
-- buildrequire recent xemacs-sumo
-- set system-uses-terminfo in default.el (#76102)
-- use defvar in default.el not to override user's settings
-- default gnus-default-article-saver to mbox format (#90604)
-- add aspell as ispell program in site-start.el (#88262)
-- add rpmbuild option "--with gtk" allowing building with gtk
-- exclude s390x temporarily
-
-* Mon May 12 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-12
-- sumo packages moved to separate xemacs-sumo package
-
-* Sat May 10 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-11
-- build with system malloc on ppc64
-
-* Tue Apr 22 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-10
-- obsoletes ruby-mode-xemacs (#84673)
-- move obsoletes xemacs-sumo-el to -el subpackage
-- fix links in jde html documentation (#89499)
-
-* Tue Apr 15 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-8
-- comment out ja and ko menubar translations in X resource files for now,
- to avoid startup hanging in utf-8 locale (#88860)
-- use default menubar font in ja and ko locale
-- in a UTF-8 locale set default coding systems to utf-8 (partly #77130
- and #74227)
-- set Info-directory-list in site-start.el again
-- move psgml setup into site-start.el
-- move previous contents of "dotxemacs-init.el" to new "default.el"
-
-* Mon Mar 31 2003 Akira TAGOH <tagoh at redhat.com> 21.4.12-7
-- Rebuild against the latest Canna.
-
-* Thu Feb 20 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-6
-- default browse-url to use htmlview and update psgml-html browser
- defaults (#84262)
-
-* Tue Feb 11 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-5
-- build with system-malloc on alpha and ia64
-- skip redundant check-features target
-
-* Thu Feb 6 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-4
-- fix "libexec dir" to be under lib64 on multilib archs
-- set default ftp to be non-kerberos in site-start.el
-- update sumos to 2003-02-05
-- mspec patch and rpm-spec-mode update no longer needed
-- buildrequire autoconf213
-- add ".xemacs/init.el" to /etc/skel
-- skip redundant check-features target on s390 and s390x
-
-* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
-- rebuilt
-
-* Tue Jan 21 2003 Jens Petersen <petersen at redhat.com> - 21.4.12-2
-- fix `paths-emacs-root-p' (find-paths.el) to look in share not lib
-- don't generate backup files when updating autoloads
-- try startup notification in desktop file
-- cleanup desktop file to use name XEmacs and add encoding key
-
-* Fri Jan 17 2003 Jens Petersen <petersen at redhat.com> 21.4.12-1
-- update to 21.4.12 bugfix release (21.4 series now declared stable branch)
-- renumbered sumo package patches to be greater than 100
-- install sumo packages by copying rather than moving
-- patch sh-script.el to append m?spec entry to auto-mode-alist
-- avoid ppc.ldscript and build on ppc
-- remove games that we shouldn't ship
-- update to latest rcs2log
-- update to latest rpm-spec-mode.el
-- use _smp_mflags for lib-src and src
-- run batch-update-directory and batch-byte-recompile-directory on sumo lisp
- dirs
-- improve datadir/xemacs-version/ ownership
-
-* Sat Jan 4 2003 Jens Petersen <petersen at redhat.com> 21.4.11-1
-- update to 21.4.11
-- don't configure with union-type, since it causes runtime problems apparently
-- only do postun info dir deletions when uninstalling
-
-* Wed Jan 1 2003 Jens Petersen <petersen at redhat.com> 21.4.10-6
-- move apel to separate package and require it
-- renamed psgml-init.el-xemacs to xemacs-psgml-init.el
-- use datadir in site-start.el
-- really include the movemail mkstemp patch
-- use mapc to load site-start.d files
-
-* Tue Dec 31 2002 Ville Skyttä <scop at xemacs.org>
-- New Sumos (2002-12-30).
-- Use `construct-emacs-version-name' in `paths-emacs-root-p' (find-paths.el),
- fixing "Couldn't find obvious default for XEmacs hierarchy" warnings
- (as in XEmacs 21.5).
-- Move site-start stuff to site-packages.
-- Don't set Info-directory-list in site-start.el.
-- Don't use --pkgdir, it's ignored. Don't pass pkgdir to makeinstall.
-- Fix source tarball URLs.
-- Don't override the defcustom in psgml-init.el, set its default value instead.
-- Add rpmbuild option: "--with debug" for building a debug-enabled XEmacs.
-
-* Sun Dec 29 2002 Jens Petersen <petersen at redhat.com>
-- updates package sumos to 2002-12-26 release
-
-* Mon Dec 23 2002 Jens Petersen <petersen at redhat.com> 21.4.10-5
-- patch find-paths.el to search in datadir
-- setup lisp packages under datadir not libdir
-- use buildroot macro instead of RPM_BUILD_ROOT
-- drop local configure macro
-- fix buildrequires and requires
-- list configure options one-per-line
-- improve psgml-init.el catalog setup
-- remove and add lisp packages with package-admin
-- rebyte-compile lisp packages
-- keep etags as etags.xemacs (#78106)
-- don't bother removing non-existent udp2tcp nor .cvsignore files
-- simply filelist generation to a single find search pass
-- put core .el files in -el package
-- put package info files into -info package
-- don't create backup files when patching in lisp packages tree
-- don't explicitly gzip lisp package info files
-- don't mark the applications files noreplace
-- exclude ppc, since __init_array_start undefined
-
-* Wed Dec 18 2002 Jens Petersen <petersen at redhat.com>
-- patch egg-wnn to default to unix domain socket (#79826)
- [patch from ynakai at redhat.com]
-- add ia64 patch from SuSE
-- use mkstemp in movemail
-
-* Tue Nov 19 2002 Jens Petersen <petersen at redhat.com>
-- apply jlatex autodetect patch correctly and drop append to tex-site.el
-- default to pTeX and pLaTeX for Japanese TeX and LaTeX
-
-* Mon Nov 18 2002 Jens Petersen <petersen at redhat.com> 21.4.10-3
-- backout uncommenting of deactivate-mark (#77696)
-- update psgml dtd catalog path in psgml-init.el (#78022)
- [reported by ville.skytta at iki.fi]
-- build with --use-union-type (#78024)
- [suggested by ville.skytta at iki.fi]
-
-* Fri Nov 15 2002 Jens Petersen <petersen at redhat.com>
-- fix autodetection of jlatex (#69129)
-
-* Tue Nov 12 2002 Elliot Lee <sopwith at redhat.com> 21.4.10-2
-- build on x86_64
-
-* Mon Nov 11 2002 Jens Petersen <petersen at redhat.com> 21.4.10-1
-- update to 21.4.10
-- update sumos to 2002-09-19
-- no longer backout mule-ucs package
-- encode this file in utf-8
-- xemacs-21.1.14-xfs.patch no longer needed
-- use _libdir, _datadir, _bindir, _prefix
-- exclude x86_64 (requires Canna)
-- own /usr/lib/xemacs/{,mule-packages} and /usr/X11R6/lib/X11/<locale> (#73982)
- [reported by enrico.scholz at informatik.tu-chemnitz.de]
-- fix default italic font size (#75275)
- [reported with fix by ville.skytta at iki.fi]
-- update ja menubar translations in ja locale X resource file (#76068)
- [from ynakai at redhat.com]
-- update ko locale X resource file (#76072) [from ynakai at redhat.com]
-- add pkgdir rpm macro for packages dir
-- uncomment deactivate-mark in simple.el (#77696)
-
-* Mon Aug 26 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-16
-- some cleanups - and remove the info tarball, it's now part
- of the base tarball. Wow, the package gets smaller. (#72480)
-
-* Mon Aug 19 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-15
-- Bug in specfile from -14 gave bug on startup (#71743)
-
-* Thu Aug 15 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-14
-- Use utf-8 by default for input/output (#71584 )
-- Make it not segfault when handling utf-8 (#71589)
-
-* Wed Aug 7 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-13
-- Add openmotif-devel to buildrequires, as it will use it for widgets
- if it finds it
-
-* Fri Aug 2 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-12
-- Don't package po-mode separately, it's now in sumo
-- Compile with drag'n'drop support
-- Use the bundled rpm-spec-mode, it has some adaptions for XEmacs
-
-* Wed Jul 31 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-11
-- Don't use a separate ispell.el file anymore - the included one is newer
-- Fix html-mode (#64826)
-
-* Tue Jul 23 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-10
-- Update lisp tarballs
-- desktop file fixes (#69542)
-- Add bdb support (#65640)
-
-* Mon Jul 8 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-9
-- Make it provide ruby-mode-xemacs (request from tagoh)
-
-* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Mon Jun 17 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-7
-- #66835
-
-* Wed May 29 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-6
-- Make it build... Evil.
-- Exclude IA64
-- Upgrade sumo tarballs to 2002-05-22
-
-* Fri May 24 2002 Jens Petersen <petersen at xemacs.org> 21.4.8-5
-- Build using portable dumper, so that build with glibc-2.3 malloc is ok
-
-* Mon May 13 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-2
-- Remove the s390 patches so it builds on s390 :)
-
-* Fri May 10 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.8-1
-- 21.4.8
-
-* Tue May 7 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.6-9
-- Rebuild... chmod -x pstogif to work around an rpm bug until
- it's fixed (#64320)
-
-* Tue Apr 23 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.6-8
-- New sumo packages
-
-* Thu Feb 21 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.6-7
-- Rebuild
-
-* Tue Jan 29 2002 Jens Petersen <petersen at redhat.com> 21.4.6-6
-- Remove skk package, since it conflicts with ddskk-xemacs (newer)
-
-* Thu Jan 24 2002 Trond Eivind Glomsrød <teg at redhat.com> 21.4.6-5
-- New sumos
-
-* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
-- automated rebuild
-
-* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-3
-- Fix fontlist pattern in Emacs.ad.Japanese.
-- CHANGES-beta is now CHANGES-release.
-- Obsolete xemacs-sumo xemacs-sumo-el
-
-* Wed Dec 19 2001 Jens Petersen <petersen at redhat.com> 21.4.6-2
-- Don't obsolete flim.
-
-* Mon Dec 17 2001 Trond Eivind Glomsrød <teg at redhat.com> 21.4.6-1
-- 21.4.6
-- New sumo packages
-- disable alpha
-
-* Wed Nov 14 2001 Jens Petersen <petersen at redhat.com> 21.4.5-2
-- Add -znocombreloc configure option to override new ld default.
+* Thu Apr 6 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-2
+- Borrow Mike Fabian's site-start.el work from the SuSE package.
-* Tue Nov 6 2001 Trond Eivind Glomsrød <teg at redhat.com> 21.4.5-1
-- 21.4.5. It builds on IA64 and fixes #55578
+* Tue Apr 4 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.26-1
+- 21.5.26 (WIP).
+- Make %%{_bindir}/xemacs an alternative (main/nox).
+- Convert some info docs to UTF-8.
+
+* Fri Mar 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.5.25-1
+- 21.5.25 (WIP).
+- Trim pre-21.5 %%changelog entries.
--- delprevline.py DELETED ---
--- menubar-games.patch DELETED ---
--- movemail-mktemp.patch DELETED ---
--- xemacs-21.4.10-find-paths-pkgdir.patch DELETED ---
--- xemacs-21.4.12-find-paths-libexec-lib64.patch DELETED ---
--- xemacs-21.4.12-mk-nochk-features.patch DELETED ---
--- xemacs-21.4.13-dump-paths-lispdir.patch DELETED ---
--- xemacs-21.4.15-wnnfix-128362.patch DELETED ---
--- xemacs-21.4.18-utf8-fonts.patch DELETED ---
--- xemacs-21.4.19-x-paths.patch DELETED ---
--- xemacs-debian-docdir-dump.patch DELETED ---
--- xemacs-no-expdyn-ia64-106744.patch DELETED ---
- Previous message (by thread): rpms/yumex/devel sources,1.23,1.24 yumex.spec,1.24,1.25
- Next message (by thread): rpms/altermime/devel .cvsignore, 1.2, 1.3 altermime.spec, 1.2, 1.3 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list