From 1fd1db5a55229c8ca60a6d9742edbfeee80858ca Mon Sep 17 00:00:00 2001 From: Jerry James Date: Nov 10 2021 00:37:10 +0000 Subject: Drop XEmacs support in F36 and later --- diff --git a/global.spec b/global.spec index 4b4a2e5..a052136 100644 --- a/global.spec +++ b/global.spec @@ -1,6 +1,6 @@ Name: global Version: 6.6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Source code tag system # The entire source code is GPLv3+ except # libglibc/ which is LGPLv2+ @@ -14,12 +14,17 @@ BuildRequires: gcc BuildRequires: ncurses-devel BuildRequires: libtool-ltdl-devel BuildRequires: python3-devel -BuildRequires: emacs, xemacs +BuildRequires: emacs +%if 0%{?fedora} < 36 +BuildRequires: xemacs +%endif BuildRequires: sqlite-devel BuildRequires: /usr/bin/pathfix.py BuildRequires: make Requires: emacs-filesystem >= %{_emacs_version} +%if 0%{?fedora} < 36 Requires: xemacs-filesystem >= %{_xemacs_version} +%endif Obsoletes: emacs-global <= 6.5.1-1 Obsoletes: emacs-global-el <= 6.5.1-1 Provides: emacs-global = %{version}-%{release} @@ -72,10 +77,12 @@ mkdir -p %{buildroot}%{_emacs_sitelispdir} install gtags.el -p -t %{buildroot}%{_emacs_sitelispdir} %{_emacs_bytecompile} %{buildroot}%{_emacs_sitelispdir}/gtags.el chmod -x %{buildroot}%{_emacs_sitelispdir}/gtags.el +%if 0%{?fedora} < 36 mkdir -p %{buildroot}%{_xemacs_sitelispdir} install gtags.el -p -t %{buildroot}%{_xemacs_sitelispdir} %{_xemacs_bytecompile} %{buildroot}%{_xemacs_sitelispdir}/gtags.el chmod -x %{buildroot}%{_xemacs_sitelispdir}/gtags.el +%endif ## Remove executable flag chmod -x %{buildroot}/%{_sysconfdir}/gtags.conf @@ -90,7 +97,9 @@ chmod -x %{buildroot}/%{_sysconfdir}/gtags.conf %{_mandir}/man*/* %{_datadir}/gtags %{_emacs_sitelispdir}/gtags.el* +%if 0%{?fedora} < 36 %{_xemacs_sitelispdir}/gtags.el* +%endif %files ctags @@ -98,6 +107,9 @@ chmod -x %{buildroot}/%{_sysconfdir}/gtags.conf %{_libdir}/gtags/* %changelog +* Tue Nov 9 2021 Jerry James - 6.6.5-5 +- Drop XEmacs support in F36 and later + * Thu Jul 22 2021 Fedora Release Engineering - 6.6.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild