- rebuild with ImageMagick 7.0.4.0

[packages/emacs.git] / emacs.spec

diff --git a/emacs.spec b/emacs.spec
index 94c25d005761c3b9d7621b1f7685c3ae30a0a1a1..62ae07c909877ef5804e8035d815d13fdaac8e6f 100644 (file)
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,10 +4,11 @@
 # - 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
+%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
+%bcond_with    bootstrap       # build bootsrtap version
 #
 Summary:       The Emacs text editor for the X Window System
 Summary(de.UTF-8):     GNU Emacs
@@ -17,12 +18,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:       23.2
-Release:       0.1
+%define        ver     25.1
+Version:       %{ver}
+Release:       4
 License:       GPL v3+
 Group:         Applications/Editors/Emacs
-Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.gz
-# Source0-md5: b6691852dae0bc142b3c12749f6b7ade
+Source0:       ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.xz
+# Source0-md5: 4f3d42fb22823a659e16bfa89078a74c
 Source1:       %{name}-dot%{name}
 Source2:       %{name}-site-start.el
 Source3:       %{name}.png
@@ -32,8 +34,8 @@ Source6:      %{name}-athena.desktop
 Source7:       %{name}-gtk.desktop
 Source8:       %{name}-motif.desktop
 Source9:       %{name}-nox.desktop
-Patch0:                %{name}-tinfo.patch
-Patch1:                %{name}-lib64.patch
+Patch0:                imagemagick7.patch
+Patch1:                bashizm.patch
 URL:           http://www.gnu.org/software/emacs/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -47,7 +49,7 @@ BuildRequires:        libtiff-devel
 BuildRequires: libtool
 BuildRequires: giflib-devel
 BuildRequires: ncurses-devel
-%{?with_motif:BuildRequires:   openmotif-devel}
+%{?with_motif:BuildRequires:   motif-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
 BuildRequires: sed >= 4.0
@@ -60,6 +62,7 @@ BuildRequires:        xorg-lib-libXmu-devel
 BuildRequires: xorg-lib-libXpm-devel
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      ctags
+Requires:      gnus-pkg-emacs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -295,7 +298,7 @@ Emacs - edytor tekstu Emacs dla X Window System (wersja Motif).
 Summary:       The libraries needed to run the GNU Emacs text editor
 Summary(pl.UTF-8):     Biblioteki potrzebne do uruchomienia edytora tekstu GNU Emacs
 Group:         Applications/Editors/Emacs
-Requires:      emacscommon
+Obsoletes:     emacs-extras
 
 %description common
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -320,24 +323,12 @@ tego pakietu potrzebny jest jeszcze właściwy program (emacs-nox lub
 emacs). Zainstaluj emacs-nox jeżeli nie zamierzasz używasz Emacsa pod
 X Window System; zainstaluj emacs jeżeli używasz X.
 
-%package extras
-Summary:       Files which conflict with XEmacs
-Summary(pl.UTF-8):     Wspólne pliki XEmacsa i GNU Emacsa
-Group:         Applications/Editors/Emacs
-Provides:      emacscommon
-Obsoletes:     emacscommon
-
-%description extras
-These files are common between GNU Emacs and XEmacs.
-
-%description extras -l pl.UTF-8
-Są to wspólne pliki GNU Emacs i XEmacs.
-
 %package gnus
 Summary:       Gnus is flexible message reader under Emacs
 Summary(pl.UTF-8):     Gnus jest czytnikiem grup dyskusyjnych pod Emacsa
 Group:         Applications/Editors/Emacs
 Requires:      %{name}-common = %{version}-%{release}
+Provides:      gnus-pkg-emacs
 
 %description gnus
 Gnus is flexible message reader under Emacs.
@@ -378,11 +369,9 @@ exit 1
 %endif
 %endif
 
-%setup -q
+%setup -q -n %{name}-%{ver}
 %patch0 -p1
-%if "%{_lib}" == "lib64"
 %patch1 -p1
-%endif
 
 %build
 cp -f /usr/share/automake/config.* .
@@ -397,15 +386,17 @@ echo "Building emacs athena binary ..."
 rm -rf build-athena
 mkdir build-athena && cd build-athena
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
        --with-tiff \
        --with-gif \
        --with-png \
-       --with-x-toolkit=athena
+       --with-x-toolkit=athena \
+       %{?with_bootstrap:--without-gpm}
 
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap athena
 cd ..
 %endif
@@ -415,18 +406,20 @@ echo "Building emacs GTK+2 binary ..."
 rm -rf build-gtk
 mkdir build-gtk && cd build-gtk
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
        --with-tiff \
        --with-gif \
        --with-png \
-       --with-x-toolkit=gtk
+       --with-x-toolkit=gtk \
+       %{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
-%{__make}
+%{__make} V=1
 %else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap gtk
 %endif
 cd ..
@@ -437,18 +430,20 @@ echo "Building emacs motif binary ..."
 rm -rf build-motif
 mkdir build-motif && cd build-motif
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --with-xpm \
        --with-jpeg \
        --with-tiff \
        --with-gif \
        --with-png \
-       --with-x-toolkit=motif
+       --with-x-toolkit=motif \
+       %{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
-%{__make}
+%{__make} V=1
 %else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap motif
 %endif
 cd ..
@@ -459,18 +454,20 @@ echo "Building emacs binary without X support ..."
 [ -d build-nox ] && rm -rf build-nox
 mkdir build-nox && cd build-nox
 ../%configure \
+       --with-crt-dir=%{_libdir} \
        --with-pop \
        --without-xpm \
        --without-jpeg \
        --without-tiff \
        --without-gif \
        --without-png \
-       --with-x=no
+       --with-x=no \
+       %{?with_bootstrap:--without-gpm}
 
 %if %{?bootstrap}
-%{__make}
+%{__make} V=1
 %else
-%{__make} -j1 bootstrap
+%{__make} -j1 V=1 bootstrap
 %define        bootstrap nox
 %endif
 cd ..
@@ -488,7 +485,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
@@ -503,7 +500,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
@@ -512,26 +509,27 @@ 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
+rm $RPM_BUILD_ROOT%{_infodir}/info.info*
 # 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
@@ -559,7 +557,7 @@ 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
@@ -573,139 +571,155 @@ fi
 %files common
 %defattr(644,root,root,755)
 %config(noreplace) /etc/skel/.emacs
-%attr(755,root,root) %{_bindir}/emacsclient
 %attr(755,root,root) %{_bindir}/ebrowse
+%attr(755,root,root) %{_bindir}/emacsclient
 %{_mandir}/man1/ebrowse*
 %{_mandir}/man1/emacs*
-%{_infodir}/*.info*
+%{_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/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(755,root,mail) %{_libdir}/emacs/%{ver}/*-linux*/hexl
+%attr(2755,root,mail) %{_libdir}/emacs/%{ver}/*-linux*/movemail
+%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*/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/calc
-%dir %{_datadir}/emacs/%{version}/lisp/calendar
-%dir %{_datadir}/emacs/%{version}/lisp/emacs-lisp
-%dir %{_datadir}/emacs/%{version}/lisp/emulation
-%dir %{_datadir}/emacs/%{version}/lisp/eshell
-%dir %{_datadir}/emacs/%{version}/lisp/international
-%dir %{_datadir}/emacs/%{version}/lisp/language
-%dir %{_datadir}/emacs/%{version}/lisp/mail
-%dir %{_datadir}/emacs/%{version}/lisp/mh-e
-%dir %{_datadir}/emacs/%{version}/lisp/net
-%dir %{_datadir}/emacs/%{version}/lisp/nxml
-%dir %{_datadir}/emacs/%{version}/lisp/obsolete
-%dir %{_datadir}/emacs/%{version}/lisp/org
-%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/url
+%dir %{_datadir}/emacs/%{ver}
+%dir %{_datadir}/emacs/%{ver}/site-lisp
+%dir %{_datadir}/emacs/%{ver}/lisp
+%dir %{_datadir}/emacs/%{ver}/lisp/calc
+%dir %{_datadir}/emacs/%{ver}/lisp/calendar
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/ede
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/semantic
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/semantic/analyze
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/semantic/bovine
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/semantic/decorate
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/semantic/symref
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/semantic/wisent
+%dir %{_datadir}/emacs/%{ver}/lisp/cedet/srecode
+%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
+%dir %{_datadir}/emacs/%{ver}/lisp/vc
 
 %{_datadir}/emacs/site-lisp
-%{_datadir}/emacs/%{version}/etc
-%{_datadir}/emacs/%{version}/lisp/*.el
-%{_datadir}/emacs/%{version}/lisp/*.elc
-%{_datadir}/emacs/%{version}/lisp/README
-%{_datadir}/emacs/%{version}/lisp/calc/*.el
-%{_datadir}/emacs/%{version}/lisp/calc/*.elc
-%{_datadir}/emacs/%{version}/lisp/calc/README*
-%{_datadir}/emacs/%{version}/lisp/calendar/*.el
-%{_datadir}/emacs/%{version}/lisp/calendar/*.elc
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/*.el
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/*.elc
-%{_datadir}/emacs/%{version}/lisp/emulation/*.elc
-%{_datadir}/emacs/%{version}/lisp/eshell/*.elc
-%{_datadir}/emacs/%{version}/lisp/eshell/esh-groups.el
-%{_datadir}/emacs/%{version}/lisp/international/*.el
-%{_datadir}/emacs/%{version}/lisp/international/*.elc
-%{_datadir}/emacs/%{version}/lisp/international/README
-%{_datadir}/emacs/%{version}/lisp/language/*.el
-%{_datadir}/emacs/%{version}/lisp/language/*.elc
-%{_datadir}/emacs/%{version}/lisp/mail/blessmail.el
-%{_datadir}/emacs/%{version}/lisp/mail/*.elc
-%{_datadir}/emacs/%{version}/lisp/mh-e/*.el
-%{_datadir}/emacs/%{version}/lisp/mh-e/*.elc
-%{_datadir}/emacs/%{version}/lisp/net/*.elc
-%{_datadir}/emacs/%{version}/lisp/nxml/*.elc
-%{_datadir}/emacs/%{version}/lisp/nxml/TODO
-%{_datadir}/emacs/%{version}/lisp/obsolete/*.elc
-%{_datadir}/emacs/%{version}/lisp/org/*.elc
-%{_datadir}/emacs/%{version}/lisp/play/bruce.el
-%{_datadir}/emacs/%{version}/lisp/play/*.elc
-%{_datadir}/emacs/%{version}/lisp/progmodes/*.elc
-%{_datadir}/emacs/%{version}/lisp/term/*.el
-%{_datadir}/emacs/%{version}/lisp/term/*.elc
-%{_datadir}/emacs/%{version}/lisp/textmodes/*.elc
-%{_datadir}/emacs/%{version}/lisp/url/*.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/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/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.el
+%{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/*.el
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/analyze/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/bovine/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/decorate/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/symref/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/wisent/*.elc
+%{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.el
+%{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.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/*.el
+%{_datadir}/emacs/%{ver}/lisp/net/*.elc
+%{_datadir}/emacs/%{ver}/lisp/nxml/*.elc
+%{_datadir}/emacs/%{ver}/lisp/obsolete/*.elc
+%{_datadir}/emacs/%{ver}/lisp/org/*.el
+%{_datadir}/emacs/%{ver}/lisp/org/*.elc
+%{_datadir}/emacs/%{ver}/lisp/play/*.elc
+%{_datadir}/emacs/%{ver}/lisp/progmodes/*.elc
+%{_datadir}/emacs/%{ver}/lisp/term/*.elc
+%{_datadir}/emacs/%{ver}/lisp/textmodes/*.elc
+%{_datadir}/emacs/%{ver}/lisp/url/*.elc
+%{_datadir}/emacs/%{ver}/lisp/vc/*.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
-
-%files extras
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/b2m
-%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*
+%{_datadir}/emacs/%{ver}/site-lisp/subdirs.el
+%{_datadir}/emacs/%{ver}/site-lisp/tuareg.el
+%{_datadir}/emacs/%{ver}/site-lisp/nemerle.el
 
 %files el
 %defattr(644,root,root,755)
-%{_datadir}/emacs/%{version}/lisp/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/calc/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/calendar/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/emacs-lisp/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/emulation/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/eshell/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/international/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/language/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/mail/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/mh-e/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/net/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/nxml/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/obsolete/*.el
-%{_datadir}/emacs/%{version}/lisp/obsolete/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/org/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/play/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/progmodes/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/term/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/textmodes/*.el.gz
-%{_datadir}/emacs/%{version}/lisp/url/*.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/cedet/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/ede/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/analyze/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/bovine/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/decorate/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/symref/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/semantic/wisent/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/cedet/srecode/*.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.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
+%{_datadir}/emacs/%{ver}/lisp/vc/*.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}/lisp/leim
+%dir %{_datadir}/emacs/%{ver}/lisp/leim/ja-dic
+%dir %{_datadir}/emacs/%{ver}/lisp/leim/quail
+%{_datadir}/emacs/%{ver}/lisp/leim/leim-list.el
+%{_datadir}/emacs/%{ver}/lisp/leim/quail/*.elc
+%{_datadir}/emacs/%{ver}/lisp/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}/lisp/leim/quail/*.el.gz
+%{_datadir}/emacs/%{ver}/lisp/leim/ja-dic/*.el.gz
 
 %if %{with nox} && %{?default_emacs} != "nox"
 %files nox
@@ -737,10 +751,11 @@ 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/*.*
+%{_datadir}/emacs/%{ver}/lisp/gnus/.dir-locals.el
+%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