# This file is encoded in UTF-8.  -*- coding: utf-8 -*-

%define emacs21 1

%define muleucs_ver current

%define tramp_ver 2.0.49

%define cc_mode_ver 5.30.9

Summary: GNU Emacs text editor

Name: emacs

Version: 21.4

Release: 16

License: GPL

URL: http://www.gnu.org/software/emacs/

Group: Applications/Editors

Source0: ftp://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.gz

%if %{emacs21}

Source1: ftp://ftp.gnu.org/gnu/emacs/leim-%{version}.tar.gz

%endif

Source3: emacs.desktop

Source4: emacs.png

Source5: dotemacs.el

Source6: site-start.el

Source7: http://www.python.org/emacs/python-mode/python-mode.el

Source8: http://cvs.xemacs.org/viewcvs.cgi/XEmacs/packages/xemacs-packages/prog-modes/rpm-spec-mode.el

%if %{emacs21}

Source10: ftp://ftp.gnu.org/gnu/emacs/elisp-manual-21-2.8.tar.bz2

%endif

Source11: http://download.sourceforge.net/php-mode/php-mode-1.1.0.tgz

Source12: php-mode-init.el

Source13: ssl.el

Source16: python-mode-init.el

Source17: rpm-spec-mode-init.el

Source18: rpm-spec-mode.el-0.14-xemacs-compat.patch

Source20: po-mode.el

Source21: po-compat.el

Source22: po-mode-init.el

Source23: po-mode-auto-replace-date-71264.patch

%if %{emacs21}

Source24: ftp://ftp.m17n.org/pub/mule/Mule-UCS/test/Mule-UCS-%{muleucs_ver}.tar.gz

%endif

Source25: lang-coding-systems-init.el

Source26: default.el

%if %{emacs21}

Source27: rfc1345.el

Source28: http://ftp.gnu.org/gnu/tramp/tramp-%{tramp_ver}.tar.gz

Source29: tramp-init.el

%endif

Source30: wrapper

Source31: igrep.el

Source32: igrep-init.el

Source33: http://download.sourceforge.net/cc-mode/cc-mode-%{cc_mode_ver}.tar.gz

Buildroot: %{_tmppath}/%{name}-%{version}-root

BuildRequires: glibc-devel, gcc, bzip2, ncurses-devel, zlib-devel, texinfo

%if %{emacs21}

Buildrequires: autoconf213, libXaw-devel, Xaw3d-devel

%else

Buildrequires: autoconf, gtk2-devel

%endif

Buildrequires: libX11-devel, libpng-devel, libjpeg-devel, giflib-devel, libtiff-devel

Requires: xorg-x11-fonts-ISO8859-1-75dpi

%ifarch %{ix86}

BuildRequires: setarch

%endif

Requires: emacs-common = %{version}-%{release}

Obsoletes: emacs-X11

Conflicts: gettext < 0.10.40

# C and build patches

Patch2: emacs-21.2-s390.patch

%if %{emacs21}

Patch3: emacs-21.2-x86_64.patch

%endif

# * needs updating for emacs22 *

Patch4: emacs-21.2-sticky-bit-80049.patch

Patch5: emacs-21.2-s390x.patch

# * needs updating for emacs22 *

Patch7: emacs-21.2-alloc-blockinput-83600.patch

%if %{emacs21}

Patch9: emacs-21.3-ppc64.patch

Patch10: editfns.c-Fformat-multibyte-davej.patch

%endif

Patch11: emacs-21.3-no-rpath.patch

# this patch is no longer strictly needed with our iiimf-12.2

# (however status under the window seems nicer)

Patch14: emacs-xim-status-under-window-125413.patch

%if %{emacs21}

Patch15: emacs-21.3-xterm-modifiers-137868.patch

# * needs updating for emacs22 *

Patch17: emacs-21.3-gcc4.patch

Patch19: emacs-21.4-21.4a-diff.patch

# * maybe needs updating for emacs22 *

Patch20: bzero-and-have-stdlib.dpatch

Patch21: coding-region-leak.dpatch

Patch22: detect-coding-iso2022.dpatch

# * maybe needs updating for emacs22 *

Patch23: fix-batch-mode-signal-handling.dpatch

Patch24: fix-x-vs-no-x-diffs.dpatch

Patch25: scroll-margin.dpatch

Patch26: xfree86-4.3-modifiers.dpatch

# generated from ftp://fly.isti.cnr.it/pub/etags.c.gz

Patch27: etags-update-to-cvs.patch

# required to build on PowerPC64

Patch34: ppc64-unexelf.patch

%endif

# Lisp and doc patches

%if %{emacs21}

Patch106: emacs-21.2-menubar-games.patch

%endif

# * needs updating for emacs22 *

Patch108: browse-url-htmlview-84262.patch

# * needs updating for emacs22 *

Patch112: emacs-21.3-lisp-textmodes-ispell-languages.patch

# * maybe needs updating for emacs22 *

Patch113: emacs-21.3-gud-libtool-fix.patch

%if %{emacs21}

# * maybe needs updating for emacs22 *

Patch118: emacs-21.3-latex-mode-hook-144083.patch

Patch119: battery-acpi-support.dpatch

Patch120: pcl-cvs-format.dpatch

Patch121: python-completion-ignored-extensions.dpatch

# * maybe needs updating for emacs22 *

Patch122: save-buffer.dpatch

Patch123: smtpmail-cvs-update.patch

%endif

Patch124: mule-cmd.el-X11-locale.alias-173781.patch

Patch125: sort-columns-posix-key-182282.patch

Patch126: ispell-german-utf-8.patch

%description

Emacs is a powerful, customizable, self-documenting, modeless text

editor. Emacs contains special code editing features, a scripting

language (elisp), and the capability to read mail, news, and more

without leaving the editor.

This package provides an emacs binary with support for X windows.

%package nox

Summary: GNU Emacs text editor without X support

Group: Applications/Editors

Requires: emacs-common = %{version}-%{release}

%description nox

Emacs is a powerful, customizable, self-documenting, modeless text

editor. Emacs contains special code editing features, a scripting

language (elisp), and the capability to read mail, news, and more

without leaving the editor.

This package provides an emacs binary with no X windows support for running

on a terminal.

%package common

Summary: Emacs common files

Group: Applications/Editors

PreReq: /sbin/install-info, dev, %{_sbindir}/alternatives

%if ! %{emacs21}

Obsoletes: emacs-leim

%endif

%description common

Emacs is a powerful, customizable, self-documenting, modeless text

editor. Emacs contains special code editing features, a scripting

language (elisp), and the capability to read mail, news, and more

without leaving the editor.

This package contains all the common files needed by emacs or emacs-nox.

%package el

Summary: Emacs Lisp source files included with Emacs.

Group: Applications/Editors

%description el

Emacs-el contains the emacs-elisp sources for many of the elisp

programs included with the main Emacs text editor package.

You need to install emacs-el only if you intend to modify any of the

Emacs packages or see some elisp examples.

%if %{emacs21}

%package leim

Summary: Emacs Lisp files for input methods for international characters.

Group: Applications/Editors

%description leim

The emacs-leim package contains Emacs Lisp code for input methods for

various international character scripts. Basically, the Lisp code

provided by this package describes the consecutive keystrokes that a

user must press in order to input a particular character in a

non-English character set. Input methods for many different character

sets are included in this package.

%endif

%define emacs_libexecdir %{_libexecdir}/emacs/%{version}/%{_host}

%ifarch %{ix86}

%define setarch setarch i386 -R

%else

%define setarch %{nil}

%endif

%prep

%if %{emacs21}

%setup -q -b 1 -a 24 -a 28 -a 33

%else

%setup -q -a 33

%endif

%patch2 -p1 -b .2-s390

%if %{emacs21}

%patch3 -p1 -b .3-hammer

%patch4 -p1 -b .4-sticky

%endif

%patch5 -p1 -b .5-s390x

%if %{emacs21}

# block input in `allocate_vectorlike' (alloc.c)

%patch7 -p1 -b .7-block

%patch9 -p1 -b .9-ppc64

%patch10 -p1 -b .10-multibyte

%endif

%patch11 -p1 -b .11-rpath

%patch14 -p1 -b .14-StatusArea

%if %{emacs21}

%patch15 -p0 -b .15-modifier

%patch17 -p1 -b .17-getcwd

%patch19 -p1 -b .19-fedora

%patch20 -p1 -b .20-bzero

%patch21 -p1 -b .21-leak

%patch22 -p1 -b .22-iso2022

%patch23 -p1 -b .23-batch

%patch24 -p1

%patch25 -p1 -b .25-scroll-margin

%patch26 -p1 -b .26-xmodifier

%patch27 -p1 -b .27-14.21

%patch34 -p1 -b .34-ppc64-unexelf

%endif

# patches 2 and 3 touch configure.in

%if %{emacs21}

autoconf-2.13

%else

autoconf

%endif

## Lisp patches

%if %{emacs21}

# remove game we can't ship

%patch106 -p1

rm lisp/finder-inf.el lisp/play/tetris.el*

# make browse-url default to htmlview not netscape

%patch108 -p1

# fix names of aspell language dictionaries

%patch112 -p1

# fix running gdb with libtool

%patch113 -p1

# run latex-mode-hook

%patch118 -p1

# battery acpi

%patch119 -p1

# pcl-cvs format

%patch120 -p1

# .pyc completion

%patch121 -p1

# save-buffer

%patch122 -p1

# smtpmail update

%patch123 -p1

%endif

# locale.alias path

%patch124 -p1

# sort-columns posix key defs

%patch125 -p1

# German spell-checking for UTF-8 encoded buffers

%patch126 -p1

# install rest of site-lisp files

( cd site-lisp

  cp %SOURCE7 %SOURCE8 %SOURCE13 %SOURCE20 %SOURCE21 %SOURCE31 .

  # xemacs compat patch for rpm-spec-mode

  patch < %SOURCE18

  # fix po-auto-replace-revision-date nil

  patch < %SOURCE23

  tar zxvf %SOURCE11

)

%if %{emacs21}

# add rfc1345 input method (default for UTF-8 lang env)

cp -pi %SOURCE27 leim/quail

%endif

# install newer cc-mode

cp -p cc-mode-%{cc_mode_ver}/*.el lisp/progmodes

%build

export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"

# stack-protector causes crashing on i386 (#174730)

%ifarch %{ix86}

CFLAGS=`echo $CFLAGS | sed -e "s/ -fstack-protector//"`

%endif

%configure --with-pop --with-sound \

%if ! %{emacs21}

  --with-gtk --without-xim

%endif

%if ! %{emacs21}

%__make bootstrap

%endif

%{setarch} %__make %{?_smp_mflags}

# remove versioned file so that we end up with .1 suffix and only one DOC file

rm src/emacs-%{version}.*

TOPDIR=${PWD}

%define emacsbatch ${TOPDIR}/src/emacs -batch --no-init-file --no-site-file

# make sure patched lisp files get byte-compiled

%emacsbatch -f batch-byte-recompile-directory lisp

%emacsbatch -f batch-byte-compile site-lisp/*.el

%if %{emacs21}

%emacsbatch -f batch-byte-compile leim/quail/rfc1345.el

%endif

%__make %{?_smp_mflags} -C lisp updates

%if %{emacs21}

( cd Mule-UCS-%{muleucs_ver}

  %{emacsbatch} -l mucs-comp.el )

( cd tramp-%{tramp_ver}

  ./configure --with-emacs=${TOPDIR}/src/emacs

  make lisp

  make -C texi tramp )

%endif

( cd cc-mode-%{cc_mode_ver}

  makeinfo cc-mode.texi )

%install

rm -rf $RPM_BUILD_ROOT

# workaround #101818 (vm/break dumper problem)

%{setarch} make install \

	prefix=%{?buildroot:%{buildroot}}%{_prefix} \

	exec_prefix=%{?buildroot:%{buildroot}}%{_exec_prefix} \

	bindir=%{?buildroot:%{buildroot}}%{_bindir} \

	sbindir=%{?buildroot:%{buildroot}}%{_sbindir} \

	sysconfdir=%{?buildroot:%{buildroot}}%{_sysconfdir} \

	datadir=%{?buildroot:%{buildroot}}%{_datadir} \

	includedir=%{?buildroot:%{buildroot}}%{_includedir} \

	libdir=%{?buildroot:%{buildroot}}%{_libdir} \

	libexecdir=%{?buildroot:%{buildroot}}%{_libexecdir} \

	localstatedir=%{?buildroot:%{buildroot}}%{_localstatedir} \

	sharedstatedir=%{?buildroot:%{buildroot}}%{_sharedstatedir} \

	mandir=%{?buildroot:%{buildroot}}%{_mandir} \

	infodir=%{?buildroot:%{buildroot}}%{_infodir}

# suffix binaries with -x

mv $RPM_BUILD_ROOT%{_bindir}/emacs{,-x}

mv $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}{,-x}

%if %{emacs21}

mv $RPM_BUILD_ROOT%{emacs_libexecdir}/fns-%{version}.1{,-x}.el

%endif

# rebuild without X support

# remove the versioned binary with X support so that we end up with .1 suffix for emacs-nox too

rm src/emacs-%{version}.*

%configure --without-x

%{setarch} %__make %{?_smp_mflags}

# install the emacs without X

install -m 0755 src/emacs-%{version}.1 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}-nox

ln $RPM_BUILD_ROOT%{_bindir}/emacs{-%{version},}-nox

%if %{emacs21}

install -m 0644 lib-src/fns-%{version}.1.el $RPM_BUILD_ROOT%{emacs_libexecdir}/fns-%{version}.1-nox.el

%endif

# install wrapper script

install -m 0755 %SOURCE30 $RPM_BUILD_ROOT%{_bindir}/emacs-%{version}

ln -s %{_bindir}/emacs-%{version} $RPM_BUILD_ROOT%{_bindir}/emacs

# make sure movemail isn't setgid

chmod 755 $RPM_BUILD_ROOT%{emacs_libexecdir}/movemail

%define site_lisp $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp

mkdir -p %{site_lisp}

install -m 0644 %SOURCE6 %{site_lisp}/site-start.el

install -m 0644 %SOURCE26 %{site_lisp}

mv $RPM_BUILD_ROOT%{_bindir}/{etags,etags.emacs}

mv $RPM_BUILD_ROOT%{_mandir}/man1/{ctags.1,gctags.1}

mv $RPM_BUILD_ROOT%{_bindir}/{ctags,gctags}

# GNOME / KDE files

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications

install -m 0644 %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/applications/gnu-emacs.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps

install -m 0644 %SOURCE4 $RPM_BUILD_ROOT%{_datadir}/pixmaps/

# install site-lisp files

install -m 0644 site-lisp/*.el{,c} %{site_lisp}

mkdir -p %{site_lisp}/site-start.d

install -m 0644 $RPM_SOURCE_DIR/*-init.el %{site_lisp}/site-start.d

# default initialization file

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/skel

install -m 0644 %SOURCE5 $RPM_BUILD_ROOT%{_sysconfdir}/skel/.emacs

%if %{emacs21}

( cd Mule-UCS-%{muleucs_ver}/lisp

  mkdir %{site_lisp}/Mule-UCS

  cp -p *.el *.elc %{site_lisp}/Mule-UCS )

( cd tramp-%{tramp_ver}

  %makeinstall lispdir=%{site_lisp}/tramp )

# elisp reference manual

tar jxf %{SOURCE10}

( cd elisp-manual-21-2.8

  install -m 644 elisp elisp-* $RPM_BUILD_ROOT%{_infodir} )

%endif

# cc-mode manual

%if %{emacs21}

rm $RPM_BUILD_ROOT%{_infodir}/ccmode*

%else

rm -f $RPM_BUILD_ROOT%{_infodir}/cc-mode*

%endif

install -m 644 cc-mode-%{cc_mode_ver}/cc-mode.info* $RPM_BUILD_ROOT%{_infodir}

# after everything is installed, remove info dir

rm -f $RPM_BUILD_ROOT%{_infodir}/dir

%if ! %{emacs21}

rm $RPM_BUILD_ROOT%{_localstatedir}/games/emacs/*

%endif

#

# create file lists

#

rm -f *-filelist {common,el}-*-files

%if %{emacs21}

rm -f *-filelist leim-*-files

%endif

( TOPDIR=${PWD}

  cd $RPM_BUILD_ROOT

  find .%{_datadir}/emacs/%{version}/lisp \

%if ! %{emacs21}

    .%{_datadir}/emacs/%{version}/leim \

%endif

    .%{_datadir}/emacs/site-lisp \( -type f -not -name '*.el' -fprint $TOPDIR/common-lisp-none-elc-files \) -o \( -type d -fprintf $TOPDIR/common-lisp-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el' ! -name site-start.el \( -exec test -e '{}'c \; -fprint $TOPDIR/el-bytecomped-files -o -fprint $TOPDIR/common-not-comped-files \) \)

%if %{emacs21}

  find .%{_datadir}/emacs/%{version}/leim \( -name '*.elc' -fprint $TOPDIR/leim-elc-files \) -o \( -type d -fprintf $TOPDIR/leim-dir-files "%%%%dir %%p\n" -fprintf $TOPDIR/el-leim-dir-files "%%%%dir %%p\n" \) -o \( -name '*.el' \( -exec test -e '{}'c \; -fprint $TOPDIR/el-leim-bytecomped-files -o -fprint $TOPDIR/leim-not-comped-files \) \)

%endif

)

# put the lists together after filtering  ./usr to /usr

sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files

cat common-*-files > common-filelist

cat el-*-files common-lisp-dir-files > el-filelist

%if %{emacs21}

cat leim-*-files > leim-filelist

%endif

%clean

rm -rf $RPM_BUILD_ROOT

%define info_files ada-mode autotype cc-mode.info cl dired-x ebrowse ediff efaq elisp emacs eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc speedbar vip viper widget woman

%post common

for f in %{info_files}; do

  /sbin/install-info %{_infodir}/$f.gz %{_infodir}/dir --section="GNU Emacs" 2> /dev/null || :

done

alternatives --install %{_bindir}/etags etags %{_bindir}/etags.emacs 80

%preun common

if [ "$1" = 0 ]; then

  for f in %{info_files}; do

    /sbin/install-info --delete %{_infodir}/$f.gz %{_infodir}/dir \

      --section="GNU Emacs" 2> /dev/null || :

  done

  alternatives --remove etags %{_bindir}/etags.emacs

fi

%files

%defattr(-,root,root)

%{_bindir}/emacs

%{_bindir}/emacs-%{version}

%{_bindir}/emacs-x

%{_bindir}/emacs-%{version}-x

%dir %{_libexecdir}/emacs

%dir %{_libexecdir}/emacs/%{version}

%dir %{emacs_libexecdir}

%if %{emacs21}

%{emacs_libexecdir}/fns-%{version}.1-x.el

%endif

%{_datadir}/applications/gnu-emacs.desktop

%{_datadir}/pixmaps/emacs.png 

%files nox

%defattr(-,root,root)

%{_bindir}/emacs

%{_bindir}/emacs-%{version}

%{_bindir}/emacs-nox

%{_bindir}/emacs-%{version}-nox

%dir %{_libexecdir}/emacs

%dir %{_libexecdir}/emacs/%{version}

%dir %{emacs_libexecdir}

%if %{emacs21}

%{emacs_libexecdir}/fns-%{version}.1-nox.el

%endif

%files -f common-filelist common

%defattr(-,root,root)

%config(noreplace) %{_sysconfdir}/skel/.emacs

%doc etc/NEWS BUGS README 

%exclude %{_bindir}/emacs

%exclude %{_bindir}/emacs-*

%{_bindir}/*

%{_mandir}/*/*

%{_infodir}/*

%dir %{_datadir}/emacs

%dir %{_datadir}/emacs/%{version}

%{_datadir}/emacs/%{version}/etc

%if %{emacs21}

# quieten startup when -leim and -el aren't installed

%dir %{_datadir}/emacs/%{version}/leim

%endif

%{_datadir}/emacs/%{version}/site-lisp

%{_libexecdir}/emacs

%if %{emacs21}

%exclude %{emacs_libexecdir}/fns-%{version}.*.el

%endif

%attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el

%attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el

%files -f el-filelist el

%defattr(-,root,root)

%dir %{_datadir}/emacs

%dir %{_datadir}/emacs/%{version}

%if %{emacs21}

%files -f leim-filelist leim

%defattr(-,root,root)

%dir %{_datadir}/emacs

%dir %{_datadir}/emacs/%{version}

%endif

%changelog

* Thu Aug  3 2006 Chip Coldwell <coldwell@redhat.com> - 21.4-16

- fix German spell checking for UTF-8 encoded buffers (Daniel Hammer #197737)

* Wed Jul 26 2006 Chip Coldwell <coldwell@redhat.com> - 21.4-15

- fix src/unexelf.c to build on PowerPC64 (backport from emacs-22, #183304)

* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 21.4-14.1.1

- rebuild

* Tue Apr 18 2006 Chip Coldwell <coldwell@redhat.com> - 21.4-14.1

- don't clobber site-lisp/default.el (Ritesh Khadgaray, 180153)

* Tue Mar  7 2006 Jens Petersen <petersen@redhat.com> - 21.4-14

- bring back setarch for i386 with -R option in spec file and drop

  emacs-21-personality-linux32-101818.patch since it no longer seems

  sufficient with recent kernels (Sam Peterson, #174736)

- buildrequire giflib-devel instead of libungif-devel

* Thu Mar  2 2006 Jens Petersen <petersen@redhat.com>

- avoid backup for fix-x-vs-no-x-diffs.dpatch (Ian Collier, #183503)

- remove the old ccmode info manual (#182084)

* Mon Feb 27 2006 Jens Petersen <petersen@redhat.com> - 21.4-13

- buildrequire libXaw-devel for menus and scrollbar

- pass -R to setarch to disable address randomization during dumping

  (Sam Peterson, #174736)

- install cc-mode.info correctly (Sam Peterson, #182084)

- fix sort-columns not to use deprecated non-posix sort key syntax

  with sort-columns-posix-key-182282.patch (Richard Ryniker, #182282)

- use system-name function not variable when setting frame-title-format in

  /etc/skel/.emacs for XEmacs users hitting .emacs

* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 21.4-12.2

- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 21.4-12.1

- rebuilt for new gcc4.1 snapshot and glibc changes

* Fri Feb  3 2006 Jens Petersen <petersen@redhat.com> - 21.4-12

- add mule-cmd.el-X11-locale.alias-173781.patch to correct location of X11

  locale.alias file (Paul Dickson, #173781)

- fix autoload of php-mode in php-mode-init.el (Christopher Beland, #179484)

* Wed Dec 14 2005 Jens Petersen <petersen@redhat.com> - 21.4-11

- avoid building with -fstack-protector on i386 to prevent crashing

  (Jonathan Kamens, #174730)

- require xorg-x11-fonts-ISO8859-1-75dpi instead of xorg-x11-fonts-75dpi

  for modular X (#174614)

* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>

- rebuilt

* Fri Nov 25 2005 Jens Petersen <petersen@redhat.com> - 21.4-10

- fix missing parenthesis in lang-coding-systems-init.el

* Tue Nov 22 2005 Jens Petersen <petersen@redhat.com> - 21.4-9

- fix keyboard-coding-system on console for utf-8 (Dawid Gajownik, #173855)

- update etags to latest cvs (Hideki Iwamoto, #173023)

  - replace etags-14.21-17.11-diff.patch with etags-update-to-cvs.patch

- update smtpmail.el to latest cvs version for better authentication support

  with smtpmail-cvs-update.patch (Alberto Brizio, #167804)

* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> - 21.4-8

- update dep for new xorg fonts packages

* Wed Aug 24 2005 Jens Petersen <petersen@redhat.com>

- fix name of aspell-es dictionary (#147964)

  - update emacs-21.3-lisp-textmodes-ispell-languages.patch

* Thu Jul 14 2005 Jens Petersen <petersen@redhat.com> - 21.4-7

- update rpm-spec-mode.el to cvs revision 1.17 (Ville Skyttä)

  - fixes expansion of %%{?dist}

- replace emacs-21.4-setarch_for_loadup-101818.patch with backport

  emacs-21-personality-linux32-101818.patch from cvs (Jan Djärv)

  which also turns off address randomization during dumping (Masatake Yamato)

  - no longer need to pass SETARCH to make on i386 (#160814)

- move ownership of %{_datadir}/emacs/ and %{_datadir}/emacs/%{version}/

  from emacs to emacs-el and emacs-leim subpackages

- don't build tramp html and dvi documentation

- drop src/config.in part of bzero-and-have-stdlib.dpatch to avoid

  compiler warnings

* Thu Jun 23 2005 Jens Petersen <petersen@redhat.com> - 21.4-6

- merge in changes from emacs22.spec conditionally

  - define emacs21 rpm macro switch to control major version and use it

- update tramp to 2.0.49

* Fri Jun 17 2005 Jens Petersen <petersen@redhat.com>

- set arg0 to emacs in wrapper script (Peter Oliver, 149512#3)

* Mon May 30 2005 Jens Petersen <petersen@redhat.com>

- move setting of require-final-newline from default.el to a comment in default

  .emacs (Ralph Loader, 119141)

* Wed May 18 2005 Jens Petersen <petersen@redhat.com> - 21.4-5

- update cc-mode to 5.30.9 stable release to address font-lock problems

  (126165,148977,150197,155292,158044)

* Mon May 16 2005 Jens Petersen <petersen@redhat.com> - 21.4-4

- don't accidently exclude emacsclient from common package

  (Jonathan Kamens, #157808)

- traditional Chinese desktop file translation (Wei-Lun Chao, #157287)

* Wed Apr 20 2005 Jens Petersen <petersen@redhat.com> - 21.4-3

- add igrep.el and init file

* Mon Apr 11 2005 Jens Petersen <petersen@redhat.com> - 21.4-2

- update etags to 17.11 (idht4n@hotmail.com, 151390)

  - add etags-14.21-17.11-diff.patch

- replace i386 setarch redefinitions of __make and makeinstall with

  emacs-21.4-setarch_for_loadup-101818.patch and setting SETARCH on i386

  (Jason Vas Dias, 101818)

* Sun Apr 10 2005 Jens Petersen <petersen@redhat.com> - 21.4-1

- update to 21.4 movemail vulnerability release

  - no longer need movemail-CAN-2005-0100.patch

- replace %{_bindir}/emacs alternatives with a wrapper script (Warren Togami)

  to prevent it from disappearing when upgrading (Michal Jaegermann, 154326)

  - suffix the X emacs binaries with -x and the no X binaries with -nox

  - the wrapper script %{_bindir}/emacs-%%version runs emacs-x if installed or

    otherwise emacs-nox.  %{_bindir}/emacs is a symlink to the wrapper

- make emacs and emacs-nox own the subdirs in %{_libexecdir}

- add a bunch of fixes from debian's emacs21_21.4a-1 patch:

    battery-acpi-support.dpatch, bzero-and-have-stdlib.dpatch,

    coding-region-leak.dpatch, detect-coding-iso2022.dpatch,

    fix-batch-mode-signal-handling.dpatch, pcl-cvs-format.dpatch,

    python-completion-ignored-extensions.dpatch,

    remote-files-permissions.dpatch, save-buffer.dpatch, scroll-margin.dpatch,

    xfree86-4.3-modifiers.dpatch

  - add fix-x-vs-no-x-diffs.dpatch

    - define emacs_libexecdir

    - build both emacs and emacs-nox as %%{version}.1 and move common DOC file

      to emacs-common

    - suffix version in fns-%%{version}.1.el with -x and -nox respectively

- add 100 to elisp patches

* Wed Apr  6 2005 Jens Petersen <petersen@redhat.com> - 21.3-27

- use alternatives to switch _bindir/emacs between emacs and emacs-nox

  (Henning Schmiedehausen, #151067)

  - remove emacs and emacs-nox from bindir

  - prereq alternatives for emacs and emacs-nox

  - add post and postun scripts to handle alternatives

- buildrequire xorg-x11-devel instead of XFree86-devel

- really include and apply emacs-21.3-latex-mode-hook-144083.patch

- make emacs and emacs-nox own _datadir/emacs/version too

* Wed Mar  9 2005 Jens Petersen <petersen@redhat.com> - 21.3-26

- rebuild with gcc 4.0

  - add emacs-21.3-gcc4.patch for emacsclient

* Mon Feb 28 2005 Jens Petersen <petersen@redhat.com> - 21.3-25

- add tramp-2.1.3 to site-lisp (David Woodhouse, 149703)

  - move removal of info dir to after its installation

  - add tramp-init.el to put tramp into load-path

* Thu Feb 24 2005 Jens Petersen <petersen@redhat.com> - 21.3-24

- mark default.el as a noreplace config file (Pawel Salek, 149310)

- only set keyboard-coding-system in xterms to fix problem with input

  Latin characters becoming prefixes and making emacs loop

  (Eddahbi Karim, 126007)

- make emacs-el own its lisp directories

- run latex-mode-hook in latex-mode (Martin Biely, 144083)

  - add emacs-21.3-latex-mode-hook-144083.patch

* Fri Feb 18 2005 Jens Petersen <petersen@redhat.com> - 21.3-23

- install %{_bindir}/emacs-nox as a hardlink of the versioned binary

- drop explicit lib requirements

- use sed instead of perl to fix up filelists

* Mon Feb 14 2005 Jens Petersen <petersen@redhat.com> - 21.3-22

- use prereq instead of contexts for common script requirements

  (Axel Thimm, 147791)

- move emacs.png from common to main package

* Fri Feb  4 2005 Jens Petersen <petersen@redhat.com> - 21.3-21

- fix CAN-2005-0100 movemail vulnerability with movemail-CAN-2005-0100.patch

  (Max Vozeler, 146701)

* Fri Jan 14 2005 Jens Petersen <petersen@redhat.com> - 21.3-20

- workaround xorg-x11 modifier key problem with

  emacs-21.3-xterm-modifiers-137868.patch (Thomas Woerner, 137868)

* Mon Nov 29 2004 Jens Petersen <petersen@redhat.com> - 21.3-19

- prefer XIM status under-the-window for now to stop xft httx from dying

  (125413): add emacs-xim-status-under-window-125413.patch

- default diff to unified format in .emacs

* Thu Nov  4 2004 Jens Petersen <petersen@redhat.com> - 21.3-18

- show emacs again in the desktop menu (132567)

- require fonts-xorg-75dpi to prevent empty boxes at startup due to missing

  fonts (Johannes Kaiser, 137060)

* Mon Oct 18 2004 Jens Petersen <petersen@redhat.com> - 21.3-17

- fix etag alternatives removal when uninstalling (Karsten Hopp, 136137)

* Fri Oct 15 2004 Jens Petersen <petersen@redhat.com> - 21.3-16

- do not setup frame-title-format in default.el, since it will override

  setting by users (Henrik Bakken, 134520)

- emacs-el no longer requires emacs for the sake of -nox users

  (Lars Hupfeldt Nielsen, 134479)

- condition calling of global-font-lock-mode in default .emacs

  in case xemacs should happen to load it

* Wed Sep 29 2004 Jens Petersen <petersen@redhat.com> - 21.3-15

- cleanup and update .desktop file

- make emacs not appear in the desktop menu (Seth Nickell,132567)

- move the desktop file from -common to main package

- go back to using just gctags for ctags

- etags is now handled by alternatives (92256)

- improve the default frame title by prefixing the buffer name

  (Christopher Beland, 128110)

- fix the names of some European aspell languages with

  emacs-21.3-lisp-textmodes-ispell-languages.patch (David Jansen, 122618)

- fixing running "libtool gdb program" in gud with

  emacs-21.3-gud-libtool-fix.patch (Dave Malcolm, 130955)

* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>

- rebuilt

* Fri Apr 30 2004 Jens Petersen <petersen@redhat.com> - 21.3-13

- unset focus-follows-mouse in default.el to make switching frames work for

  click-to-focus (Theodore Belding,114736)

* Thu Apr 15 2004 Jens Petersen <petersen@redhat.com> - 21.3-12

- update php-mode to 1.1.0

- add emacs-21.3-no-rpath.patch so that /usr/X11R6/lib is not rpath'ed

- require /bin/ln for %%post (Tim Waugh, 119817)

- move prereq for dev and /sbin/install-info to emacs-common

- leim no longer requires emacs

- use source site-lisp dir in %%prep to setup site files

- define and use site_lisp for buildroot in %%install

- default ispell dictionary to "english" for CJK locale

- add comment to top of site-start.el about load order

- turn on auto-compression-mode in default.el (114808)

- set require-final-newline with setq (David Olsson,119141)

  and remove redundant next-line-add-newlines setting

- update info_file list (Reuben Thomas,114729)

* Wed Mar 16 2004 Mike A. Harris <mharris@redhat.com> 21.3-11

- Removed bogus Requires: XFree86-libs that was added in 21.3-8, as rpm

  find-requires will automatically pick up the dependancies on any runtime

  libraries, and such hard coded requires is not X11 implementation

  agnostic (#118471)

* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>

- rebuilt

* Sat Jan 24 2004 Jens Petersen <petersen@redhat.com> - 21.3-9

- bring back emacs-nox subpackage (emacs built without X support) (#113001)

  [suggested by Frank Kruchio]

- base emacs package now only contains emacs binary built with X support

  and no longer obsoletes emacs-nox

- all the common files required by emacs and emacs-nox are now in emacs-common

- update php-mode.el to 1.0.5

- add missing rfc1345.el leim input method

- update po-compat.el to version in gettext-0.13.1

- update base package summary

- add url for python-mode.el and php-mode.el

- gctags is now a symlink to ctags.emacs

* Wed Jan 14 2004 Jens Petersen <petersen@redhat.com> - 21.3-8

- comment out setting transient-mark-mode in skel .emacs (#102441,#90193)

  [reported by mal@gromco.com, Jonathan Kamens]

- improve lang-coding-systems-init.el to set-language-environment for CJK

  utf-8 locale too and use utf-8 for default-coding-systems and

  terminal-coding-system (#111172) [Yoshinori Kuniga]

- update rpm-spec-mode.el to newer one in xemacs package cvs (#105888) [Dams]

- rename etags to etags.emacs and make etags a symlink to it at install time

  if it doesn't exist (#92256) [marc_soft@merlins.org]

- apply editfns.c-Fformat-multibyte-davej.patch to fix multibyte code typo

  in Fformat [patch from Dave Jones]

- add runtime requirements for XFree86-libs, image libraries, ncurses and zlib

- improve -el and -leim package summaries

- no longer configure build with redundant --with-gcc

* Tue Nov 25 2003 Jens Petersen <petersen@redhat.com>

- buildrequire autoconf213 (#110741) [reported by mvd@mylinux.com.ua]

* Mon Oct 27 2003 Jens Petersen <petersen@redhat.com> - 21.3-7

- use "setarch i386" to build on ix86 (#101818) [reported by Michael Redinger]

- use __make to %%build and %%install

- set keyboard coding-system for utf-8 in lang-coding-systems-init.el (#106929)

  [reported with fix by Axel Thimm]

- add source url for MuleUCS

- update base package description (#103551) [reported by Tim Landscheidt]

* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>

- rebuilt

* Wed May  7 2003 Jens Petersen <petersen@redhat.com> - 21.3-5

- move transient-mark-mode and global-font-lock-mode setting from default.el

  back to dotemacs, so as not to surprise old users (#90193)

  [reported by jik@kamens.brookline.ma.us]

- change require-final-newline to query (default.el)

- don't make a backup when applying browse-url-htmlview-84262.patch (#90226)

  [reported by mitr@volny.cz]

* Fri May  2 2003 Elliot Lee <sopwith@redhat.com>

- Add emacs-21.3-ppc64.patch

* Fri Apr 25 2003 Jens Petersen <petersen@redhat.com> - 21.3-3

- use Mule-UCS utf-8 coding-system for CJK subprocess IO

- no need to set fontset anymore in CJK locale

* Wed Apr 16 2003 Jens Petersen <petersen@redhat.com> - 21.3-2

- add Mule-UCS for CJK utf-8 support (suggested by Akira Tagoh)

  and use it by default in CJK UTF-8 locale

- move emacs-asian startup files into new lang-coding-systems-init.el

- utf-8 setup in site-start.el is no longer needed in Emacs 21.3

- generate filelist for site-lisp automatically like base lisp and leim

- don't setup aspell in site-start.el

- rename dotemacs to dotemacs.el and move former contents to new default.el

* Mon Apr  7 2003 Jens Petersen <petersen@redhat.com> - 21.3-1

- update to 21.3

- no longer set compound-text-with-extensions in dotemacs, since it is now

  the default

- emacs-21.2-pop.patch is no longer needed

- update php-mode to 1.0.4

* Thu Feb 20 2003 Jens Petersen <petersen@redhat.com> - 21.2-33

- default browse-url to use htmlview (#84262)