#9 Drop XEmacs support in F36 and later
Merged 2 years ago by ngompa. Opened 2 years ago by jjames.
Unknown source rawhide  into  rawhide

file modified
+8 -5
@@ -1,6 +1,6 @@

  Name:           rpmdevtools

  Version:        9.5

- Release:        2%{?dist}

+ Release:        3%{?dist}

  Summary:        RPM Development Tools

  

  # rpmdev-setuptree is GPLv2, everything else GPLv2+
@@ -27,7 +27,7 @@

  # emacs-common >= 1:22.3-3 for macros.emacs

  BuildRequires:  emacs-common >= 1:22.3-3

  BuildRequires:  bash-completion

- %if 0%{?fedora}

+ %if 0%{?fedora} && 0%{?fedora} < 36

  # xemacs-common >= 21.5.29-8 for macros.xemacs

  BuildRequires:  xemacs-common >= 21.5.29-8

  %endif
@@ -45,7 +45,7 @@

  Requires:       python3dist(rpm)

  Requires:       sed

  Requires:       emacs-filesystem

- %if 0%{?fedora}

+ %if 0%{?fedora} && 0%{?fedora} < 36

  Requires:       xemacs-filesystem

  %endif

  # Optionally support rpmautospec
@@ -87,7 +87,7 @@

  [ -d %{buildroot}%{_sysconfdir}/bash_completion.d ] && \

  echo %%{_sysconfdir}/bash_completion.d > %{name}.files

  

- %if 0%{?fedora}

+ %if 0%{?fedora} && 0%{?fedora} < 36

  for dir in %{_emacs_sitestartdir} %{_xemacs_sitestartdir} ; do

  %else

  for dir in %{_emacs_sitestartdir} ; do
@@ -110,7 +110,7 @@

  %{_bindir}/*

  %{_emacs_sitestartdir}/rpmdev-init.el

  %ghost %{_emacs_sitestartdir}/rpmdev-init.elc

- %if 0%{?fedora}

+ %if 0%{?fedora} && 0%{fedora} < 36

  %{_xemacs_sitestartdir}/rpmdev-init.el

  %ghost %{_xemacs_sitestartdir}/rpmdev-init.elc

  %endif
@@ -118,6 +118,9 @@

  

  

  %changelog

+ * Tue Nov  9 2021 Jerry James <loganjerry@gmail.com> - 9.5-3

+ - Drop XEmacs support in F36 and later

+ 

  * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 9.5-2

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

  

The xemacs, xemacs-packages-base, and xemacs-packages-extra packages were deprecated in January of this year due to lack of upstream maintenance. (And yes, I was part of upstream.) I wish to retire these packages for F36 and later. Please merge this pull request prior to the F36 branch point, which is currently scheduled for 8 February 2022.

The XEmacs packages are present in F35 and earlier, and will continue to be maintained throughout the lifespan of F35. At this time, the requested change only needs to be made in Rawhide.

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

The rpm-linter failure does not appear to me to have anything to do with this change.

Pull-Request has been merged by ngompa

2 years ago
Metadata