PR#51: Make pythonX-rpm-macros depend on python-rpm-macros - rpms/python-rpm-macros

rpms / python-rpm-macros

#51 Make pythonX-rpm-macros depend on python-rpm-macros

Merged 3 years ago by churchyard. Opened 3 years ago by churchyard.

rpms/ churchyard/python-rpm-macros inter_deps into master

Make pythonX-rpm-macros depend on python-rpm-macros

Miro Hrončok • 3 years ago

fed99a0

python-rpm-macros.spec

file modified

+6 -1

		`@@ -1,6 +1,6 @@`
		`Name: python-rpm-macros`
		`Version: 3.8`
		`- Release: 2%{?dist}`
		`+ Release: 3%{?dist}`
		`Summary: The common Python RPM macros`

		`# macros: MIT, compileall2.py: PSFv2`
		`@@ -35,6 +35,7 @@`
		`%package -n python2-rpm-macros`
		`Summary: RPM macros for building Python 2 packages`
		`Requires: python-srpm-macros >= 3-38`
		`+ Requires: python-rpm-macros`
		`# Would need to be different for each release - worth it?`
		`#Conflicts: python2-devel < 2.7.11-3`

		`@@ -44,6 +45,7 @@`
		`%package -n python3-rpm-macros`
		`Summary: RPM macros for building Python 3 packages`
		`Requires: python-srpm-macros >= 3-38`
		`+ Requires: python-rpm-macros`

		`%description -n python3-rpm-macros`
		`RPM macros for building Python 3 packages.`
		`@@ -78,6 +80,9 @@`


		`%changelog`
		`+ * Mon Apr 27 2020 Miro Hrončok <mhroncok@redhat.com> - 3.8-3`
		`+ - Make pythonX-rpm-macros depend on python-rpm-macros (#1827811)`
		`+`
		`* Tue Mar 31 2020 Lumír Balhar <lbalhar@redhat.com> - 3.8-2`
		`- Update of bundled compileall2 module to 0.7.1 (bugfix release)`

churchyard commented 3 years ago

%pyX_(build|install) uses %py_setup from python-rpm-macros

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1827811

lbalhar commented 3 years ago

The diff looks good to me and I can confirm that the fixed version of python3-rpm-macros depends on python-rpm-macros and that this fixes the problem mentioned in the bugzilla.

python3-rpm-macros-3.8-2.fc33

# rpm --eval "%{py3_build}"
\
  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\
  /usr/bin/python3 %{py_setup}  build --executable="/usr/bin/python3 -s"

Explicit upgrade of python3-rpm-macros (to 3.8-3.fc33) installs also python-rpm-macros

# rpm --eval "%{py3_build}"
\
  CFLAGS="${CFLAGS:-${RPM_OPT_FLAGS}}" LDFLAGS="${LDFLAGS:-${RPM_LD_FLAGS}}"\
  /usr/bin/python3 setup.py  build --executable="/usr/bin/python3 -s"

churchyard commented 3 years ago

Note to self: This needs backports :(

Pull-Request has been merged by churchyard

3 years ago

churchyard commented 3 years ago

Backported down to F31. Will do F30 only upon request.