Consolidate more files and requirements into the common subpackage
Depend on google-noto-sans-mono-vf-fonts rather than dejavu-sans-mono-fonts, since that's Fedora's default these days.
This commit is contained in:
commit
e27f9eabc4
29
emacs.spec
29
emacs.spec
@ -89,16 +89,13 @@ BuildRequires: util-linux
|
|||||||
%endif
|
%endif
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
|
||||||
# Emacs requires info for info mode, rhbz#1989264
|
# Emacs doesn't run without a font, rhbz#732422
|
||||||
Requires: info
|
Requires: google-noto-sans-mono-vf-fonts
|
||||||
# Emacs doesn't run without dejavu-sans-mono-fonts, rhbz#732422
|
|
||||||
Requires: desktop-file-utils
|
|
||||||
Requires: dejavu-sans-mono-fonts
|
|
||||||
Requires: libgccjit
|
|
||||||
Requires(preun): %{_sbindir}/alternatives
|
Requires(preun): %{_sbindir}/alternatives
|
||||||
Requires(posttrans): %{_sbindir}/alternatives
|
Requires(posttrans): %{_sbindir}/alternatives
|
||||||
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||||
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
Provides: emacs(bin) = %{epoch}:%{version}-%{release}
|
||||||
|
Supplements: ((libwayland-server or xorg-x11-server-Xorg) and emacs-common)
|
||||||
|
|
||||||
%define site_lisp %{_datadir}/emacs/site-lisp
|
%define site_lisp %{_datadir}/emacs/site-lisp
|
||||||
%define site_start_d %{site_lisp}/site-start.d
|
%define site_start_d %{site_lisp}/site-start.d
|
||||||
@ -117,7 +114,7 @@ This package provides an emacs binary with support for X windows.
|
|||||||
|
|
||||||
%package lucid
|
%package lucid
|
||||||
Summary: GNU Emacs text editor with LUCID toolkit X support
|
Summary: GNU Emacs text editor with LUCID toolkit X support
|
||||||
Requires: libgccjit
|
Requires: google-noto-sans-mono-vf-fonts
|
||||||
Requires(preun): %{_sbindir}/alternatives
|
Requires(preun): %{_sbindir}/alternatives
|
||||||
Requires(posttrans): %{_sbindir}/alternatives
|
Requires(posttrans): %{_sbindir}/alternatives
|
||||||
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||||
@ -134,7 +131,6 @@ using LUCID toolkit.
|
|||||||
|
|
||||||
%package nox
|
%package nox
|
||||||
Summary: GNU Emacs text editor without X support
|
Summary: GNU Emacs text editor without X support
|
||||||
Requires: libgccjit
|
|
||||||
Requires(preun): %{_sbindir}/alternatives
|
Requires(preun): %{_sbindir}/alternatives
|
||||||
Requires(posttrans): %{_sbindir}/alternatives
|
Requires(posttrans): %{_sbindir}/alternatives
|
||||||
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
Requires: emacs-common = %{epoch}:%{version}-%{release}
|
||||||
@ -157,7 +153,10 @@ License: GPL-3.0-or-later AND GFDL-1.3-no-invariants-or-later AND BSD-3-Cl
|
|||||||
Requires(preun): %{_sbindir}/alternatives
|
Requires(preun): %{_sbindir}/alternatives
|
||||||
Requires(posttrans): %{_sbindir}/alternatives
|
Requires(posttrans): %{_sbindir}/alternatives
|
||||||
Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
|
Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
|
||||||
|
Requires: libgccjit
|
||||||
|
Recommends: (emacs or emacs-lucid or emacs-nox)
|
||||||
Recommends: enchant2
|
Recommends: enchant2
|
||||||
|
Recommends: info
|
||||||
Provides: %{name}-el = %{epoch}:%{version}-%{release}
|
Provides: %{name}-el = %{epoch}:%{version}-%{release}
|
||||||
Obsoletes: emacs-el < 1:24.3-29
|
Obsoletes: emacs-el < 1:24.3-29
|
||||||
# transient.el is provided by emacs in lisp/transient.el
|
# transient.el is provided by emacs in lisp/transient.el
|
||||||
@ -481,13 +480,6 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
|
|||||||
%files -f gtk-eln-filelist -f gtk-dirs
|
%files -f gtk-eln-filelist -f gtk-dirs
|
||||||
%{_bindir}/emacs-%{version}
|
%{_bindir}/emacs-%{version}
|
||||||
%attr(0755,-,-) %ghost %{_bindir}/emacs
|
%attr(0755,-,-) %ghost %{_bindir}/emacs
|
||||||
%{_datadir}/applications/emacs.desktop
|
|
||||||
%{_datadir}/applications/emacs-mail.desktop
|
|
||||||
%{_metainfodir}/%{name}.metainfo.xml
|
|
||||||
%{_datadir}/icons/hicolor/*/apps/emacs.png
|
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
|
|
||||||
%{_datadir}/icons/hicolor/scalable/apps/emacs.ico
|
|
||||||
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
|
|
||||||
|
|
||||||
%files lucid -f lucid-eln-filelist -f lucid-dirs
|
%files lucid -f lucid-eln-filelist -f lucid-dirs
|
||||||
%{_bindir}/emacs-%{version}-lucid
|
%{_bindir}/emacs-%{version}-lucid
|
||||||
@ -508,6 +500,13 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
|
|||||||
%{_bindir}/emacsclient
|
%{_bindir}/emacsclient
|
||||||
%{_bindir}/etags.emacs
|
%{_bindir}/etags.emacs
|
||||||
%{_bindir}/gctags
|
%{_bindir}/gctags
|
||||||
|
%{_datadir}/applications/emacs.desktop
|
||||||
|
%{_datadir}/applications/emacs-mail.desktop
|
||||||
|
%{_metainfodir}/%{name}.metainfo.xml
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/emacs.png
|
||||||
|
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
|
||||||
|
%{_datadir}/icons/hicolor/scalable/apps/emacs.ico
|
||||||
|
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
|
||||||
%{_mandir}/man1/ebrowse.1*
|
%{_mandir}/man1/ebrowse.1*
|
||||||
%{_mandir}/man1/emacs.1*
|
%{_mandir}/man1/emacs.1*
|
||||||
%{_mandir}/man1/emacsclient.1*
|
%{_mandir}/man1/emacsclient.1*
|
||||||
|
Loading…
Reference in New Issue
Block a user