public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
To: git-commits@fedoraproject.org
Subject: [rpms/rpkg] 1.70-1: Use %__python2, define iif not defined
Date: Mon, 10 Aug 2026 21:43:55 GMT	[thread overview]
Message-ID: <178639823546.1.13114279114602893990.rpms-rpkg-6d0a9af74d35@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/rpkg
            Branch : 1.70-1
            Commit : 6d0a9af74d35430f8eb0ff0b77c62d02992f9b66
            Author : Miro Hrončok <miro@hroncok.cz>
            Date   : 2018-05-22T00:27:03+02:00
            Stats  : +4/-3 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/rpkg/c/6d0a9af74d35430f8eb0ff0b77c62d02992f9b66?branch=1.70-1

            Log:
            Use %__python2, define iif not defined

This gets rid of https://taskotron.fedoraproject.org/artifacts/all/2ae538e2-5cde-11e8-99a0-525400fc9f92/tests.yml/output.log

But ti preserves plain RHEL 6/7 compatibility.

---
diff --git a/rpkg.spec b/rpkg.spec
index 9705afd..d341a5c 100644
--- a/rpkg.spec
+++ b/rpkg.spec
@@ -1,5 +1,6 @@
 # sitelib for noarch packages, sitearch for others (remove the unneeded one)
 %{!?python2_sitelib: %global python2_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?__python2: %global __python2 %{__python}}
 
 Name:           rpkg
 Version:        1.54
@@ -181,8 +182,8 @@ Common files for python2-%{name} and python3-%{name}.
 
 %build
 %if 0%{?with_python2}
-%{__python} setup.py build
-%{__python} doc/rpkg_man_page.py > rpkg.1
+%{__python2} setup.py build
+%{__python2} doc/rpkg_man_page.py > rpkg.1
 %endif
 
 %if 0%{?with_python3}
@@ -193,7 +194,7 @@ Common files for python2-%{name} and python3-%{name}.
 
 %install
 %if 0%{?with_python2}
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python2} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 %endif
 
 %if 0%{?with_python3}

                 reply	other threads:[~2026-08-10 21:43 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178639823546.1.13114279114602893990.rpms-rpkg-6d0a9af74d35@fedoraproject.org \
    --to=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox