X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=emacs.spec;h=2324a205b27e8b14830190654bdaa479981f7987;hb=6d8d9b64a07da4f409969ee550882d2955b5fcd6;hp=4cd5d6a37df6155cc0b0c3c686d04d9ac187b72b;hpb=dc101559c0de894163585f15a49e6b2a32a2cccd;p=packages%2Femacs.git diff --git a/emacs.spec b/emacs.spec index 4cd5d6a..2324a20 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,11 +4,12 @@ # - 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 Summary(es.UTF-8): GNU Emacs @@ -17,13 +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 -%define ver 23.3 -Version: %{ver}b -Release: 1 +%define ver 24.3 +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: f2bfd8eab7e3b34a0f7f09acc0667e71 +Source0: ftp://ftp.gnu.org/pub/gnu/emacs/%{name}-%{version}.tar.xz +# Source0-md5: ea9ed000ca165280265aabb55b9afbd7 Source1: %{name}-dot%{name} Source2: %{name}-site-start.el Source3: %{name}.png @@ -33,9 +34,7 @@ Source6: %{name}-athena.desktop Source7: %{name}-gtk.desktop Source8: %{name}-motif.desktop Source9: %{name}-nox.desktop -Patch0: %{name}-tinfo.patch -Patch1: %{name}-lib64.patch -Patch2: %{name}-fontconfig.patch +Patch0: %{name}-fontconfig.patch URL: http://www.gnu.org/software/emacs/ BuildRequires: autoconf BuildRequires: automake @@ -49,7 +48,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 @@ -62,6 +61,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 @@ -297,7 +297,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 @@ -322,24 +322,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. @@ -382,10 +370,6 @@ exit 1 %setup -q -n %{name}-%{ver} %patch0 -p1 -%if "%{_lib}" == "lib64" -%patch1 -p1 -%endif -%patch2 -p1 %build cp -f /usr/share/automake/config.* . @@ -400,13 +384,15 @@ 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 %define bootstrap athena @@ -418,13 +404,15 @@ 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} @@ -440,13 +428,15 @@ 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} @@ -462,13 +452,15 @@ 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} @@ -525,6 +517,7 @@ install %{SOURCE9} $RPM_BUILD_ROOT%{_desktopdir} [ -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/%{ver}/lisp/erc @@ -576,24 +569,22 @@ 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 +%attr(755,root,root) %{_bindir}/grep-changelog %{_mandir}/man1/ebrowse* %{_mandir}/man1/emacs* +%{_mandir}/man1/grep-changelog* %{_infodir}/* %dir %{_libdir}/emacs %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(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/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 @@ -606,6 +597,11 @@ fi %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 @@ -623,6 +619,7 @@ fi %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/%{ver}/etc @@ -642,32 +639,35 @@ fi %{_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/cedet/*.el %{_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/nxml/TODO %{_datadir}/emacs/%{ver}/lisp/obsolete/*.elc +%{_datadir}/emacs/%{ver}/lisp/org/*.el %{_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 +%{_datadir}/emacs/%{ver}/lisp/vc/*.elc %dir /var/games/emacs /var/games/emacs/tetris-scores @@ -677,20 +677,20 @@ fi %{_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}/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/%{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 @@ -708,6 +708,7 @@ fi %{_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) @@ -754,6 +755,7 @@ fi %defattr(644,root,root,755) %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