#3 Properly escape nested macro calls
Merged 4 years ago by amoralej. Opened 4 years ago by churchyard.
rpms/ churchyard/python-debtcollector macros_escape  into  master

file modified
+3 -3
@@ -5,9 +5,9 @@ 

  %global pyver 2

  %endif

  %global pyver_bin python%{pyver}

- %global pyver_sitelib %python%{pyver}_sitelib

- %global pyver_install %py%{pyver}_install

- %global pyver_build %py%{pyver}_build

+ %global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}

+ %global pyver_install %{expand:%{py%{pyver}_install}}

+ %global pyver_build %{expand:%{py%{pyver}_build}}

  # End of macros for py2/py3 compatibility

  

  %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

%python%{pyver}_sitelib only works when %python is not defined.
Now it is and this fails.

For reference, this is possible in Fedora and EPEL:

%if ...
%global __python %__python3
%else
%global __python %__python2
%endif

%python_sitelib -> /usr/lib/python3.8/site-packages
%py_build -> /usr/bin/python3 setup.py  build ...
%py_install -> /usr/bin/python3 setup.py  install ...
%python -> /usr/bin/python3

So the %pyver macros are not in fact needed at all. However some RDO macros might interfere here.

Pull-Request has been merged by amoralej

4 years ago

Thanks for merging. Note that couple more oslo packages have this. I've opened bugzillas for them.

Thanks for merging. Note that couple more oslo packages have this. I've opened bugzillas for them.

yep, i'm taking care of all bz i've got

Also found this in python-designateclient. Will push the same fix directly.

Also python-oslo-context. Fixed.

Pushed to python-keystoneauth1, python-octaviaclient. python-oslo-concurrency, python-os-client-config, python-os-service-types, python-oslo-serialization and congressclient.

For reference:

$ rg -F '%global pyver_sitelib %python%{pyver}_sitelib' rpm-specs --sort-files
rpm-specs/diskimage-builder.spec
9:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-aodhclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-automaton.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-barbicanclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-cinderclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-cliff.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-congressclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-debtcollector.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-designateclient.spec
9:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-futurist.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-glanceclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-heatclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-ironicclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-keystoneauth1.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-keystoneclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-magnumclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-manilaclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-mistralclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-mox3.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-neutronclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-novaclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-octaviaclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-openstackclient.spec
10:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-openstacksdk.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-os-client-config.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-os-service-types.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-os-testr.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-osc-lib.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-concurrency.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-config.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-context.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-db.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-i18n.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-log.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-serialization.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslo-utils.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-oslotest.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-reno.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-rsd-lib.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-rsdclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-saharaclient.spec
10:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-shade.spec
9:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-stevedore.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-sushy.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-swiftclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-tackerclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-taskflow.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-troveclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-vitrageclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

rpm-specs/python-zaqarclient.spec
8:%global pyver_sitelib %python%{pyver}_sitelib

I can mass push the change to all the remaining packages, do you want me to?

I can mass push the change to all the remaining packages, do you want me to?

Yes please. I was preparing some script to do the same, so if you have it ready to push, please do it.

I don't have it ready, but I have done similar things in the past. Will coordinate here.

Please ack:

$ parallel -j 12 fedpkg clone -- diskimage-builder python-aodhclient python-automaton python-barbicanclient python-cinderclient python-cliff python-congressclient python-debtcollector python-designateclient python-futurist python-glanceclient python-heatclient python-ironicclient python-keystoneauth1 python-keystoneclient python-magnumclient python-manilaclient python-mistralclient python-mox3 python-neutronclient python-novaclient python-octaviaclient python-openstackclient python-openstacksdk python-osc-lib python-os-client-config python-oslo-concurrency python-oslo-config python-oslo-context python-oslo-db python-oslo-i18n python-oslo-log python-oslo-serialization python-oslotest python-oslo-utils python-os-service-types python-os-testr python-reno python-rsdclient python-rsd-lib python-saharaclient python-shade python-stevedore python-sushy python-swiftclient python-tackerclient python-taskflow python-troveclient python-vitrageclient python-zaqarclient
...

$ rg -F '%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}' -l
python-oslo-context/python-oslo-context.spec
python-oslo-serialization/python-oslo-serialization.spec
python-os-client-config/python-os-client-config.spec
python-os-service-types/python-os-service-types.spec
python-congressclient/python-congressclient.spec
python-keystoneauth1/python-keystoneauth1.spec
python-designateclient/python-designateclient.spec
python-oslo-concurrency/python-oslo-concurrency.spec
python-debtcollector/python-debtcollector.spec
python-octaviaclient/python-octaviaclient.spec

$ rm python-oslo-context python-oslo-serialization python-os-client-config python-os-service-types python-congressclient python-keystoneauth1 python-designateclient python-oslo-concurrency python-debtcollector python-octaviaclient -rf

$ for pkg in *; do
  cd $pkg
  sed -i 's/%python%{pyver}_sitelib/%{expand:%{python%{pyver}_sitelib}}/' $pkg.spec
  sed -i 's/%py%{pyver}_install/%{expand:%{py%{pyver}_install}}/' $pkg.spec
  sed -i 's/%py%{pyver}_build/%{expand:%{py%{pyver}_build}}/' $pkg.spec
  git diff
  cd ..
done

$ for pkg in *; do (cd $pkg && git commit -am'Properly escape nested macro calls' && git show); done
commit 6ba238811531a759167b8e871224f07209ef0f61
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:08 2020 +0100

    Properly escape nested macro calls

diff --git a/diskimage-builder.spec b/diskimage-builder.spec
index a25a85d..5569316 100644
--- a/diskimage-builder.spec
+++ b/diskimage-builder.spec
@@ -6,9 +6,9 @@
 %endif

 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 8d5cbb0e2f369dee60c12075b9978e83306c4a60
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:08 2020 +0100

    Properly escape nested macro calls

diff --git a/python-aodhclient.spec b/python-aodhclient.spec
index 88f106e..ca7977d 100644
--- a/python-aodhclient.spec
+++ b/python-aodhclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %global pypi_name aodhclient

commit 27d1dd0e50aecd8b44b9b227e7b3f7016513c741
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:08 2020 +0100

    Properly escape nested macro calls

diff --git a/python-automaton.spec b/python-automaton.spec
index d5a34f2..43861e2 100644
--- a/python-automaton.spec
+++ b/python-automaton.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global pypi_name automaton
commit 14ee0c5b48ac3e9728c6a481a9f9617d97b3f664
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:08 2020 +0100

    Properly escape nested macro calls

diff --git a/python-barbicanclient.spec b/python-barbicanclient.spec
index 2eefc13..72fc58d 100644
--- a/python-barbicanclient.spec
+++ b/python-barbicanclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 5421c76b624a5f110e9f0ae4e1bde295dc193780
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:08 2020 +0100

    Properly escape nested macro calls

diff --git a/python-cinderclient.spec b/python-cinderclient.spec
index 8d5699e..aa27e71 100644
--- a/python-cinderclient.spec
+++ b/python-cinderclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 9f6be07950db1549fa2b890f74aadd264ad85d07
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:08 2020 +0100

    Properly escape nested macro calls

diff --git a/python-cliff.spec b/python-cliff.spec
index 727d007..441d6e5 100644
--- a/python-cliff.spec
+++ b/python-cliff.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 65587bae2cb05bc681ace84ff9c8835fc5483fc9
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-futurist.spec b/python-futurist.spec
index 197b065..6b81db9 100644
--- a/python-futurist.spec
+++ b/python-futurist.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %global with_doc 1
commit 7214cc79a31b9066efbadca74ee7b6703038bda4
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-glanceclient.spec b/python-glanceclient.spec
index 9179e86..b0e7d1d 100644
--- a/python-glanceclient.spec
+++ b/python-glanceclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 5c63a5ea67f7076fe828969989b4ec04634c379b
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-heatclient.spec b/python-heatclient.spec
index 623e23b..50037a8 100644
--- a/python-heatclient.spec
+++ b/python-heatclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global with_doc 1
commit 1a9fb6e626e791e84ac6f32aa80cd7b00f5e1ca0
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-ironicclient.spec b/python-ironicclient.spec
index 669cd80..285974c 100644
--- a/python-ironicclient.spec
+++ b/python-ironicclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 76295ea227d0844c1debc70e270246dde7c21f7d
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-keystoneclient.spec b/python-keystoneclient.spec
index a478433..96d5669 100644
--- a/python-keystoneclient.spec
+++ b/python-keystoneclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit f902977333bcc6d76fe7f5c50b2550d2538e8656
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-magnumclient.spec b/python-magnumclient.spec
index d4850f0..9c7f60b 100644
--- a/python-magnumclient.spec
+++ b/python-magnumclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global sname python-magnumclient
commit 3dafdc40000473de47571ff8982bbeeb4322e2b0
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-manilaclient.spec b/python-manilaclient.spec
index 9889c3a..c2f1eb6 100644
--- a/python-manilaclient.spec
+++ b/python-manilaclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit da6820de126f3bce9e06c128a7293ea3c939e61f
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-mistralclient.spec b/python-mistralclient.spec
index 2ae50c3..1b16c8a 100644
--- a/python-mistralclient.spec
+++ b/python-mistralclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %global pypi_name mistralclient
 %global cliname   mistral
commit 5c0f5c7fab0f9997af9b57eb0b6f78bdbd141e99
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-mox3.spec b/python-mox3.spec
index d476ff4..06fff8b 100644
--- a/python-mox3.spec
+++ b/python-mox3.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 # Created by pyp2rpm-1.1.1
 %global pypi_name mox3
commit 40164a7103ef6508cc0ba7da67b18145b2dd9106
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-neutronclient.spec b/python-neutronclient.spec
index bcd60cc..df49962 100644
--- a/python-neutronclient.spec
+++ b/python-neutronclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global with_doc 1
commit ebe01d346f3edf6170afc16a8e4cf042fff5d438
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-novaclient.spec b/python-novaclient.spec
index 65518c1..e9963e1 100644
--- a/python-novaclient.spec
+++ b/python-novaclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 783e5a98a332926b6832018e71b4f3c7f9d6c4b9
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-openstackclient.spec b/python-openstackclient.spec
index 5f3de2a..f1af392 100644
--- a/python-openstackclient.spec
+++ b/python-openstackclient.spec
@@ -7,9 +7,9 @@
 %global __python %{__python2}
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit e1b7fcbbb101d90df4bcb02462c87238186eaf91
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-openstacksdk.spec b/python-openstacksdk.spec
index df05f3d..36b3424 100644
--- a/python-openstacksdk.spec
+++ b/python-openstacksdk.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 1449521b70c848d6b0d8d49d612d00a88ff8b34f
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-osc-lib.spec b/python-osc-lib.spec
index 5d9d658..c2398fd 100644
--- a/python-osc-lib.spec
+++ b/python-osc-lib.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 9d7f52cded0a97c24b7898cd2a297df5ab881a48
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-oslo-config.spec b/python-oslo-config.spec
index 7756327..7e8adc0 100644
--- a/python-oslo-config.spec
+++ b/python-oslo-config.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %global sname oslo.config
 %global pypi_name oslo-config
commit 72a467d59089f85cab56dae659c094c951ac4e76
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:09 2020 +0100

    Properly escape nested macro calls

diff --git a/python-oslo-db.spec b/python-oslo-db.spec
index 2294095..90388d0 100644
--- a/python-oslo-db.spec
+++ b/python-oslo-db.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 3ccff8faa52e08ac4aba6e05f2ce0d43d480f408
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-oslo-i18n.spec b/python-oslo-i18n.spec
index ca9f753..7214af3 100644
--- a/python-oslo-i18n.spec
+++ b/python-oslo-i18n.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 9af91debd174c28f06af581724f27fa31e21dd57
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-oslo-log.spec b/python-oslo-log.spec
index fb1913a..0789d2e 100644
--- a/python-oslo-log.spec
+++ b/python-oslo-log.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 826e31e28c1da6f777fae397ee3fef9125730986
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-oslotest.spec b/python-oslotest.spec
index 4cde99d..5407008 100644
--- a/python-oslotest.spec
+++ b/python-oslotest.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %global pypi_name oslotest
 # Remove after train bootstrapping is completed
commit f942a7737f6eabc967fb6ebf34f6efdb7bd1826f
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-oslo-utils.spec b/python-oslo-utils.spec
index 888d882..50acbc6 100644
--- a/python-oslo-utils.spec
+++ b/python-oslo-utils.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %global pypi_name oslo.utils
 %global pkg_name oslo-utils
commit 3e5cad2c8f04133914a02262e1f9c91416488668
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-os-testr.spec b/python-os-testr.spec
index 9d1f241..9e3c8aa 100644
--- a/python-os-testr.spec
+++ b/python-os-testr.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit b590a24c06e896f572f257675036099adab7d343
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-reno.spec b/python-reno.spec
index 0925858..3eaacb9 100644
--- a/python-reno.spec
+++ b/python-reno.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
 %global pypi_name reno
commit fe41692b42bfde5923e434b0297d82c6548cbad3
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-rsdclient.spec b/python-rsdclient.spec
index 68e2fe1..2c66eaa 100644
--- a/python-rsdclient.spec
+++ b/python-rsdclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit dbe57aacb5c5904c82df27360a7bd6791d7969a2
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-rsd-lib.spec b/python-rsd-lib.spec
index 60410ab..d777394 100644
--- a/python-rsd-lib.spec
+++ b/python-rsd-lib.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit bd6b76392ee50e359b08599349c2ff2dfcd7824e
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-saharaclient.spec b/python-saharaclient.spec
index 122ac0f..87583eb 100644
--- a/python-saharaclient.spec
+++ b/python-saharaclient.spec
@@ -7,9 +7,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit c45b7d54b87ebb3fec44ce6943a5ee0bb9bc3e5b
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-shade.spec b/python-shade.spec
index ab07d3a..053e6ad 100644
--- a/python-shade.spec
+++ b/python-shade.spec
@@ -6,9 +6,9 @@
 %endif

 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 0d7d3ba7e52b945ebf8c2a5e07ed6356531ad07d
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-stevedore.spec b/python-stevedore.spec
index 8dd8eba..4468381 100644
--- a/python-stevedore.spec
+++ b/python-stevedore.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 014c7792d35de78cc47084838f5e0c1db0462568
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-sushy.spec b/python-sushy.spec
index da94ce5..8542b1b 100644
--- a/python-sushy.spec
+++ b/python-sushy.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 302eb02cda77783cebe662301e238a5a8a68861f
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-swiftclient.spec b/python-swiftclient.spec
index c2c5ce1..b098538 100644
--- a/python-swiftclient.spec
+++ b/python-swiftclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit 81feccec522326010c89a81e90972891eef25b27
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-tackerclient.spec b/python-tackerclient.spec
index ecfcba7..96273b1 100644
--- a/python-tackerclient.spec
+++ b/python-tackerclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit 4cdfea89980e5fb2da6cf6d9da6a64e449b38b01
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:10 2020 +0100

    Properly escape nested macro calls

diff --git a/python-taskflow.spec b/python-taskflow.spec
index b842d20..891cf54 100644
--- a/python-taskflow.spec
+++ b/python-taskflow.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

commit bd87283cc807fd8c8708699d9b0b8ae7b4579f4d
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:11 2020 +0100

    Properly escape nested macro calls

diff --git a/python-troveclient.spec b/python-troveclient.spec
index 2773c9e..56f8e87 100644
--- a/python-troveclient.spec
+++ b/python-troveclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility

 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
commit a4ec4c9370a5fdf413006d967714583196ee4d7c
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:11 2020 +0100

    Properly escape nested macro calls

diff --git a/python-vitrageclient.spec b/python-vitrageclient.spec
index d12214a..9161447 100644
--- a/python-vitrageclient.spec
+++ b/python-vitrageclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %global pypi_name vitrageclient

commit e7920f1457ed74812e60955aeafd3cf1b5765a1d
Author: Miro Hrončok <miro@hroncok.cz>
Date:   Mon Jan 20 20:16:11 2020 +0100

    Properly escape nested macro calls

diff --git a/python-zaqarclient.spec b/python-zaqarclient.spec
index 0807c62..3d4f687 100644
--- a/python-zaqarclient.spec
+++ b/python-zaqarclient.spec
@@ -5,9 +5,9 @@
 %global pyver 2
 %endif
 %global pyver_bin python%{pyver}
-%global pyver_sitelib %python%{pyver}_sitelib
-%global pyver_install %py%{pyver}_install
-%global pyver_build %py%{pyver}_build
+%global pyver_sitelib %{expand:%{python%{pyver}_sitelib}}
+%global pyver_install %{expand:%{py%{pyver}_install}}
+%global pyver_build %{expand:%{py%{pyver}_build}}
 # End of macros for py2/py3 compatibility
 %{!?upstream_version: %global upstream_version %{version}%{?milestone}}

Is this good to push?

Yes, LGTM