- up to 23.3a (builds; files need update)

[packages/emacs.git] / emacs.spec

diff --git a/emacs.spec b/emacs.spec
index 896b4f6e893e8c5ae9772d89573a14de3320b8cb..dd3f8311febd54934051eff4a4a9a46c40a65d93 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,10 +1,14 @@
+# TODO:
+# - package cedit lisp files files
+# - package new (non gtk) desktop file?
+# - package ctags/etags in subpackage?
 #
 # Conditional build:
 %bcond_without athena  # don't build athena version
 %bcond_without gtk     # don't build GTK+2 version
 %bcond_without motif   # don't build motif version
 %bcond_without nox     # don't build nox version
-#
+
 Summary:       The Emacs text editor for the X Window System
 Summary(de.UTF-8):     GNU Emacs
 Summary(es.UTF-8):     GNU Emacs
@@ -13,12 +17,13 @@ Summary(pl.UTF-8):  GNU Emacs - edytor tekstu dla systemu X Window
 Summary(pt_BR.UTF-8):  GNU Emacs
 Summary(tr.UTF-8):     GNU Emacs
 Name:          emacs
-Version:       22.2
-Release:       1
+%define        ver     23.3
+Version:       %{ver}a
+Release:       0.1
 License:       GPL v3+
 Group:         Applications/Editors/Emacs
 Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.gz
-# Source0-md5: d6ee586b8752351334ebf072904c4d51
+# Source0-md5: 20aef9ea5b5bf8050d39f8b1e96a1c04
 Source1:       %{name}-dot%{name}
 Source2:       %{name}-site-start.el
 Source3:       %{name}.png
@@ -30,23 +35,29 @@ Source8:    %{name}-motif.desktop
 Source9:       %{name}-nox.desktop
 Patch0:                %{name}-tinfo.patch
 Patch1:                %{name}-lib64.patch
-Patch2:                %{name}-quote.patch
+Patch2:                %{name}-fontconfig.patch
 URL:           http://www.gnu.org/software/emacs/
 BuildRequires: autoconf
 BuildRequires: automake
+BuildRequires: ncurses-devel
+BuildRequires: freetype-devel
 %{?with_gtk:BuildRequires:     gtk+2-devel}
+BuildRequires: libdnet-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
-BuildRequires: libungif-devel
+BuildRequires: giflib-devel
 BuildRequires: ncurses-devel
 %{?with_motif:BuildRequires:   openmotif-devel}
+BuildRequires: pkgconfig
+BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
 BuildRequires: texinfo
 BuildRequires: xorg-lib-libX11-devel
 %{?with_athena:BuildRequires:  xorg-lib-libXaw-devel}
 BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXft-devel
 BuildRequires: xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXpm-devel
 Requires:      %{name}-common = %{version}-%{release}
@@ -369,7 +380,7 @@ exit 1
 %endif
 %endif
 
-%setup -q
+%setup -q -n %{name}-%{ver}
 %patch0 -p1
 %if "%{_lib}" == "lib64"
 %patch1 -p1
@@ -480,7 +491,7 @@ install -d $RPM_BUILD_ROOT{%{_infodir},%{_datadir}/emacs/site-lisp/site-start.d}
        $RPM_BUILD_ROOT{%{_desktopdir},/etc/skel,%{_pixmapsdir}} \
 
 %if %{with athena}%{with gtk}%{with motif}%{with nox}
-%{makeinstall} -C build-%{bootstrap}
+%makeinstall -C build-%{bootstrap}
 %else
 echo 'ERROR: neither athena nor gtk nor motif nor nox emacs was built.' 1>&2
 exit 1
@@ -495,7 +506,7 @@ for e in gtk athena motif nox ; do
        if [ -f $RPM_BUILD_ROOT%{_bindir}/emacs-$e ] ; then
                (cd $RPM_BUILD_ROOT%{_bindir}
                 cp -pf emacs-$e emacs
-                cp -pf emacs-$e emacs-%{version}
+                cp -pf emacs-$e emacs-%{ver}
                )
                break;
        fi
@@ -504,26 +515,26 @@ done
 install site-start.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/skel/.emacs
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/emacs/%{version}/site-lisp/tuareg.el
-install %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/emacs/%{version}/site-lisp/nemerle.el
+install %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/emacs/%{ver}/site-lisp/tuareg.el
+install %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/emacs/%{ver}/site-lisp/nemerle.el
 install %{SOURCE6} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE7} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE8} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE9} $RPM_BUILD_ROOT%{_desktopdir}
 
-[ -d build-nox ] && install build-nox/etc/DOC-* $RPM_BUILD_ROOT%{_datadir}/emacs/%{version}/etc
+[ -d build-nox ] && install build-nox/etc/DOC-* $RPM_BUILD_ROOT%{_datadir}/emacs/%{ver}/etc
 
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 # ERC is in separate spec
-rm -fr $RPM_BUILD_ROOT%{_datadir}/emacs/%{version}/lisp/erc
+rm -fr $RPM_BUILD_ROOT%{_datadir}/emacs/%{ver}/lisp/erc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  -p      /sbin/postshell
+%post  common -p       /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
-%postun        -p      /sbin/postshell
+%postun        common -p       /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %triggerin nox -- emacs-X11
@@ -551,220 +562,153 @@ fi
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/emacs
-%attr(755,root,root) %{_bindir}/emacs-%{version}
+%attr(755,root,root) %{_bindir}/emacs-%{ver}
 %{_desktopdir}/emacs-%{default_emacs}.desktop
 %{_pixmapsdir}/*
+%{_iconsdir}/hicolor/16x16/apps/emacs*.png
+%{_iconsdir}/hicolor/24x24/apps/emacs*.png
+%{_iconsdir}/hicolor/32x32/apps/emacs*.png
+%{_iconsdir}/hicolor/48x48/apps/emacs*.png
+%{_iconsdir}/hicolor/128x128/apps/emacs*.png
+%{_iconsdir}/hicolor/scalable/apps/emacs*.svg
+%{_iconsdir}/hicolor/scalable/mimetypes/emacs*.svg
 
 %files common
 %defattr(644,root,root,755)
 %config(noreplace) /etc/skel/.emacs
 %attr(755,root,root) %{_bindir}/emacsclient
 %attr(755,root,root) %{_bindir}/ebrowse
+%{_mandir}/man1/ebrowse*
 %{_mandir}/man1/emacs*
 %{_infodir}/*
 
 %dir %{_libdir}/emacs
-%dir %{_libdir}/emacs/%{version}
-%dir %{_libdir}/emacs/%{version}/*
-
-%attr(2755,root,mail) %{_libdir}/emacs/%{version}/*-linux/movemail
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/cvtmail
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/digest-doc
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/fakemail
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/hexl
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/profile
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/rcs2log
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/sorted-doc
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/vcdiff
-%attr(755,root,mail) %{_libdir}/emacs/%{version}/*-linux/update-game-score
+%dir %{_libdir}/emacs/%{ver}
+%dir %{_libdir}/emacs/%{ver}/*
+
+%attr(2755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/movemail
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/digest-doc
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/fakemail
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/hexl
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/profile
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/rcs2log
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/sorted-doc
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/vcdiff
+%attr(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux/update-game-score
 
 %dir %{_datadir}/emacs
-%dir %{_datadir}/emacs/%{version}
-%dir %{_datadir}/emacs/%{version}/site-lisp
-%dir %{_datadir}/emacs/%{version}/lisp
-%dir %{_datadir}/emacs/%{version}/leim
-%dir %{_datadir}/emacs/%{version}/lisp/calendar
-%dir %{_datadir}/emacs/%{version}/lisp/calc
-%dir %{_datadir}/emacs/%{version}/lisp/emacs-lisp
-%dir %{_datadir}/emacs/%{version}/lisp/emulation
-%dir %{_datadir}/emacs/%{version}/lisp/international
-%dir %{_datadir}/emacs/%{version}/lisp/language
-%dir %{_datadir}/emacs/%{version}/lisp/mail
-%dir %{_datadir}/emacs/%{version}/lisp/play
-%dir %{_datadir}/emacs/%{version}/lisp/progmodes
-%dir %{_datadir}/emacs/%{version}/lisp/term
-%dir %{_datadir}/emacs/%{version}/lisp/textmodes
-%dir %{_datadir}/emacs/%{version}/lisp/eshell
-%dir %{_datadir}/emacs/%{version}/lisp/net
-%dir %{_datadir}/emacs/%{version}/lisp/obsolete
-%dir %{_datadir}/emacs/%{version}/lisp/mh-e
+%dir %{_datadir}/emacs/%{ver}
+%dir %{_datadir}/emacs/%{ver}/site-lisp
+%dir %{_datadir}/emacs/%{ver}/lisp
+%dir %{_datadir}/emacs/%{ver}/leim
+%dir %{_datadir}/emacs/%{ver}/lisp/calc
+%dir %{_datadir}/emacs/%{ver}/lisp/calendar
+%dir %{_datadir}/emacs/%{ver}/lisp/emacs-lisp
+%dir %{_datadir}/emacs/%{ver}/lisp/emulation
+%dir %{_datadir}/emacs/%{ver}/lisp/eshell
+%dir %{_datadir}/emacs/%{ver}/lisp/international
+%dir %{_datadir}/emacs/%{ver}/lisp/language
+%dir %{_datadir}/emacs/%{ver}/lisp/mail
+%dir %{_datadir}/emacs/%{ver}/lisp/mh-e
+%dir %{_datadir}/emacs/%{ver}/lisp/net
+%dir %{_datadir}/emacs/%{ver}/lisp/nxml
+%dir %{_datadir}/emacs/%{ver}/lisp/obsolete
+%dir %{_datadir}/emacs/%{ver}/lisp/org
+%dir %{_datadir}/emacs/%{ver}/lisp/play
+%dir %{_datadir}/emacs/%{ver}/lisp/progmodes
+%dir %{_datadir}/emacs/%{ver}/lisp/term
+%dir %{_datadir}/emacs/%{ver}/lisp/textmodes
+%dir %{_datadir}/emacs/%{ver}/lisp/url
 
 %{_datadir}/emacs/site-lisp
-%{_datadir}/emacs/%{version}/etc
-%{_datadir}/emacs/%{version}/lisp/*.elc
-%{_datadir}/emacs/%{version}/lisp/README
-%{_datadir}/emacs/%{version}/lisp/cus-load.el
-%{_datadir}/emacs/%{version}/lisp/cus-start.el.gz
-%{_datadir}/emacs/%{version}/lisp/cus-theme.el.gz
-%{_datadir}/emacs/%{version}/lisp/finder-inf.el
-%{_datadir}/emacs/%{version}/lisp/forms-pass.el
-%{_datadir}/emacs/%{version}/lisp/generic-x.el.gz
-%{_datadir}/emacs/%{version}/lisp/load*.el
-%{_datadir}/emacs/%{version}/lisp/load*.el.gz
-%{_datadir}/emacs/%{version}/lisp/ldefs-boot.el
-%{_datadir}/emacs/%{version}/lisp/longlines.el.gz
-%{_datadir}/emacs/%{version}/lisp/patcomp.el
-%{_datadir}/emacs/%{version}/lisp/paths.el
-%{_datadir}/emacs/%{version}/lisp/subdirs.el
-%{_datadir}/emacs/%{version}/lisp/version.el
-%{_datadir}/emacs/%{version}/lisp/language/*.elc
-%{_datadir}/emacs/%{version}/lisp/mail/*.elc
-%{_datadir}/emacs/%{version}/lisp/mail/blessmail.el
-%{_datadir}/emacs/%{version}/lisp/play/*.elc
-%{_datadir}/emacs/%{version}/lisp/play/bruce.el
-%{_datadir}/emacs/%{version}/lisp/term/*.elc
-%{_datadir}/emacs/%{version}/lisp/term/cygwin.el
-%{_datadir}/emacs/%{version}/lisp/term/AT386.el
-%{_datadir}/emacs/%{version}/lisp/term/apollo.el
-%{_datadir}/emacs/%{version}/lisp/term/bobcat.el
-%{_datadir}/emacs/%{version}/lisp/term/internal.el
-%{_datadir}/emacs/%{version}/lisp/term/iris-ansi.el
-%{_datadir}/emacs/%{version}/lisp/term/linux.el
-%{_datadir}/emacs/%{version}/lisp/term/lk201.el
-%{_datadir}/emacs/%{version}/lisp/term/news.el
-%{_datadir}/emacs/%{version}/lisp/term/rxvt.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/vt102.el
-%{_datadir}/emacs/%{version}/lisp/term/vt125.el
-%{_datadir}/emacs/%{version}/lisp/term/vt2*
-%{_datadir}/emacs/%{version}/lisp/term/vt3*
-%{_datadir}/emacs/%{version}/lisp/term/vt4*
-%{_datadir}/emacs/%{version}/lisp/term/wyse50.el
-%{_datadir}/emacs/%{version}/lisp/term/xterm.el.gz
-%{_datadir}/emacs/%{version}/lisp/emulation/*.elc
-%{_datadir}/emacs/%{version}/lisp/international/*.elc
-%{_datadir}/emacs/%{version}/lisp/international/latin-*.el
-%{_datadir}/emacs/%{version}/lisp/international/mule-conf.el
-%{_datadir}/emacs/%{version}/lisp/international/latexenc.el.gz
-%{_datadir}/emacs/%{version}/lisp/calendar/*.elc
-%{_datadir}/emacs/%{version}/lisp/calc/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/calc/README*
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/*.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-specs.el
-%{_datadir}/emacs/%{version}/lisp/textmodes/*.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/*.elc
-%{_datadir}/emacs/%{version}/lisp/eshell/*.elc
-%{_datadir}/emacs/%{version}/lisp/eshell/esh-groups.el
-%{_datadir}/emacs/%{version}/lisp/net/*.elc
-%{_datadir}/emacs/%{version}/lisp/obsolete/*.elc
-%dir %{_datadir}/emacs/%{version}/lisp/url
-%{_datadir}/emacs/%{version}/lisp/url/*.elc
-%{_datadir}/emacs/%{version}/lisp/url/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/calc/*.elc
-%{_datadir}/emacs/%{version}/lisp/mh-e/*.el
-%{_datadir}/emacs/%{version}/lisp/mh-e/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/mh-e/*.elc
+%{_datadir}/emacs/%{ver}/etc
+%{_datadir}/emacs/%{ver}/lisp/*.el
+%{_datadir}/emacs/%{ver}/lisp/*.elc
+%{_datadir}/emacs/%{ver}/lisp/README
+%{_datadir}/emacs/%{ver}/lisp/calc/*.el
+%{_datadir}/emacs/%{ver}/lisp/calc/*.elc
+%{_datadir}/emacs/%{ver}/lisp/calc/README*
+%{_datadir}/emacs/%{ver}/lisp/calendar/*.el
+%{_datadir}/emacs/%{ver}/lisp/calendar/*.elc
+%{_datadir}/emacs/%{ver}/lisp/emacs-lisp/*.el
+%{_datadir}/emacs/%{ver}/lisp/emacs-lisp/*.elc
+%{_datadir}/emacs/%{ver}/lisp/emulation/*.elc
+%{_datadir}/emacs/%{ver}/lisp/eshell/*.elc
+%{_datadir}/emacs/%{ver}/lisp/eshell/esh-groups.el
+%{_datadir}/emacs/%{ver}/lisp/international/*.el
+%{_datadir}/emacs/%{ver}/lisp/international/*.elc
+%{_datadir}/emacs/%{ver}/lisp/international/README
+%{_datadir}/emacs/%{ver}/lisp/language/*.el
+%{_datadir}/emacs/%{ver}/lisp/language/*.elc
+%{_datadir}/emacs/%{ver}/lisp/mail/blessmail.el
+%{_datadir}/emacs/%{ver}/lisp/mail/*.elc
+%{_datadir}/emacs/%{ver}/lisp/mh-e/*.el
+%{_datadir}/emacs/%{ver}/lisp/mh-e/*.elc
+%{_datadir}/emacs/%{ver}/lisp/net/*.elc
+%{_datadir}/emacs/%{ver}/lisp/nxml/*.elc
+%{_datadir}/emacs/%{ver}/lisp/nxml/TODO
+%{_datadir}/emacs/%{ver}/lisp/obsolete/*.elc
+%{_datadir}/emacs/%{ver}/lisp/org/*.elc
+%{_datadir}/emacs/%{ver}/lisp/play/bruce.el
+%{_datadir}/emacs/%{ver}/lisp/play/*.elc
+%{_datadir}/emacs/%{ver}/lisp/progmodes/*.elc
+%{_datadir}/emacs/%{ver}/lisp/term/*.el
+%{_datadir}/emacs/%{ver}/lisp/term/*.elc
+%{_datadir}/emacs/%{ver}/lisp/textmodes/*.elc
+%{_datadir}/emacs/%{ver}/lisp/url/*.elc
 
 %dir /var/games/emacs
 /var/games/emacs/tetris-scores
 /var/games/emacs/snake-scores
 
-%{_datadir}/emacs/%{version}/site-lisp/subdirs.el
-%{_datadir}/emacs/%{version}/site-lisp/tuareg.el
-%{_datadir}/emacs/%{version}/site-lisp/nemerle.el
+%{_datadir}/emacs/%{ver}/site-lisp/subdirs.el
+%{_datadir}/emacs/%{ver}/site-lisp/tuareg.el
+%{_datadir}/emacs/%{ver}/site-lisp/nemerle.el
 
 %files extras
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/b2m
-%attr(755,root,root) %{_bindir}/rcs-checkin
 %attr(755,root,root) %{_bindir}/grep-changelog
+%attr(755,root,root) %{_bindir}/rcs-checkin
+%{_mandir}/man1/b2m*
+%{_mandir}/man1/grep-changelog*
+%{_mandir}/man1/rcs-checkin*
 
 %files el
 %defattr(644,root,root,755)
-%{_datadir}/emacs/%{version}/lisp/forms-d2.dat
-%{_datadir}/emacs/%{version}/lisp/a*.el.gz
-%{_datadir}/emacs/%{version}/lisp/b*.el.gz
-%{_datadir}/emacs/%{version}/lisp/c[a-tv]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/cus-[a-k]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/custom.el.gz
-%{_datadir}/emacs/%{version}/lisp/g[f-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/[de]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/f[!io]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/fi[!n]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/find[!e]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/finder.el.gz
-%{_datadir}/emacs/%{version}/lisp/fo[!r]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/form[!s]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/forms.el.gz
-%{_datadir}/emacs/%{version}/lisp/forms-d2.el
-%{_datadir}/emacs/%{version}/lisp/[h-k]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/l[a-n]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/locate.el.gz
-%{_datadir}/emacs/%{version}/lisp/log-*.el.gz
-%{_datadir}/emacs/%{version}/lisp/l[p-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/[m-o]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/paren.el.gz
-%{_datadir}/emacs/%{version}/lisp/p[b-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/[q-r]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/s-*.el.gz
-%{_datadir}/emacs/%{version}/lisp/s[a-t]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/subr.el.gz
-%{_datadir}/emacs/%{version}/lisp/[t-u]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/[w-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/v[a-d]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/v[f-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/language/*.el
-%{_datadir}/emacs/%{version}/lisp/language/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/[c-r]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/[t-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/sendmail.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/smtpmail.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/supercite.el.gz
-%{_datadir}/emacs/%{version}/lisp/play/[!b]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/play/b[!r]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/*-win.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/sun.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/sup-mouse.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/tty-colors.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/tvi*.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/vt100.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/sun-mouse.el.gz
-%{_datadir}/emacs/%{version}/lisp/emulation/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/[a-k]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/[o-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/latin*-disp.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/mule-cmds.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/mule-diag.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/mule-util.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/mule.el.gz
-%{_datadir}/emacs/%{version}/lisp/calendar/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/[!c]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/c[a-k]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/c[m-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-[!s]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl-seq.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/cl.el.gz
-%{_datadir}/emacs/%{version}/lisp/textmodes/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/progmodes/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/eshell/e[a-r]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/eshell/esh-[!g]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/eshell/esh-*.el
-%{_datadir}/emacs/%{version}/lisp/eshell/esh[a-z]*.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/*.el
-%{_datadir}/emacs/%{version}/lisp/obsolete/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/calc/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/calendar/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/emacs-lisp/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/emulation/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/eshell/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/international/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/language/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/mail/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/mh-e/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/net/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/nxml/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/obsolete/*.el
+%{_datadir}/emacs/%{ver}/lisp/obsolete/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/org/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/play/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/progmodes/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/term/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/textmodes/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/url/*.el.gz
 
 %files leim
 %defattr(644,root,root,755)
-%dir %{_datadir}/emacs/%{version}/leim/ja-dic
-%dir %{_datadir}/emacs/%{version}/leim/quail
-%{_datadir}/emacs/%{version}/leim/leim-list.el
-%{_datadir}/emacs/%{version}/leim/quail/*.elc
-%{_datadir}/emacs/%{version}/leim/ja-dic/*.elc
+%dir %{_datadir}/emacs/%{ver}/leim/ja-dic
+%dir %{_datadir}/emacs/%{ver}/leim/quail
+%{_datadir}/emacs/%{ver}/leim/leim-list.el
+%{_datadir}/emacs/%{ver}/leim/quail/*.elc
+%{_datadir}/emacs/%{ver}/leim/ja-dic/*.elc
 
 %files leim-el
 %defattr(644,root,root,755)
-%{_datadir}/emacs/%{version}/leim/quail/*.el.gz
-%{_datadir}/emacs/%{version}/leim/ja-dic/*.el.gz
+%{_datadir}/emacs/%{ver}/leim/quail/*.el.gz
+%{_datadir}/emacs/%{ver}/leim/ja-dic/*.el.gz
 
 %if %{with nox} && %{?default_emacs} != "nox"
 %files nox
@@ -796,10 +740,10 @@ fi
 
 %files gnus
 %defattr(644,root,root,755)
-%dir %{_datadir}/emacs/%{version}/lisp/gnus
-%{_datadir}/emacs/%{version}/lisp/gnus/*.*
-%exclude %{_datadir}/emacs/%{version}/lisp/gnus/*.el.gz
+%dir %{_datadir}/emacs/%{ver}/lisp/gnus
+%{_datadir}/emacs/%{ver}/lisp/gnus/*.*
+%exclude %{_datadir}/emacs/%{ver}/lisp/gnus/*.el.gz
 
 %files gnus-el
 %defattr(644,root,root,755)
-%{_datadir}/emacs/%{version}/lisp/gnus/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/gnus/*.el.gz