#10 Move xemacs condition to bcond
Closed 11 months ago by trawets. Opened 2 years ago by trawets.
https://github.com/stewartsmith/fedora-pkg-rpmdevtools.git bcond-xemacs  into  rawhide

Move xemacs condition to bcond
Stewart Smith • 2 years ago  
rpmdevtools.spec
file modified
+10 -4
@@ -1,3 +1,9 @@

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

+ %bcond_without xemacs

+ %else

+ %bcond_with xemacs

+ %endif

+ 

  Name:           rpmdevtools

  Version:        9.6

  Release:        2%{?dist}
@@ -27,7 +33,7 @@

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

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

  BuildRequires:  bash-completion

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

+ %if %{with xemacs}

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

  BuildRequires:  xemacs-common >= 21.5.29-8

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

  Requires:       python3dist(rpm)

  Requires:       sed

  Requires:       emacs-filesystem

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

+ %if %{with xemacs}

  Requires:       xemacs-filesystem

  %endif

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

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

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

  

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

+ %if %{with xemacs}

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

  %else

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

  %{_bindir}/*

  %{_emacs_sitestartdir}/rpmdev-init.el

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

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

+ %if %{with xemacs}

  %{_xemacs_sitestartdir}/rpmdev-init.el

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

  %endif

no initial comment

Pretty simple change to move it to a bcond and make the distro condition live in one place.

This makes for a simpler patch in Amazon Linux to build without xemacs.

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

rebased onto 83ddd7c

2 years ago

It has been zero days since bcond_with/bcond_without tripped me up.

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

@trawets Could you please rebase?

rebased onto 5925a16

2 years ago

Build succeeded.

Can you rebase again please?

Looks like the following just stripped out the xemacs parts:

commit 302155c3041bbcbf8669ebf84ea3988751912593 (origin/rawhide, origin/main, origin/HEAD, rawhide)
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date:   Tue Apr 18 22:50:58 2023 -0400

    Import C9S changes

    This drops the unwanted fakeroot and python3-progressbar2 dependencies
    from RHEL/ELN builds, and also removes obsolete F<36 conditionals.

So unless we're especially keen to keep Fedora < 36 branches around, this can just be dropped now.

Pull-Request has been closed by trawets

11 months ago
Metadata