diff options
| author | Orion Poplawski <orion@cora.nwra.com> | 2016-01-25 17:00:49 -0700 |
|---|---|---|
| committer | Orion Poplawski <orion@cora.nwra.com> | 2016-01-25 17:00:49 -0700 |
| commit | 9bbd8328314e6eff23aa5998cd0af3947b2db39d (patch) | |
| tree | f7463ff3ed4f136533b724a770eedf93b2ce3e1b | |
| parent | 2c1c983d5a4b8bc79e771cb8fd3f571b37d38d71 (diff) | |
| download | python34-9bbd8328314e6eff23aa5998cd0af3947b2db39d.tar.gz python34-9bbd8328314e6eff23aa5998cd0af3947b2db39d.tar.xz python34-9bbd8328314e6eff23aa5998cd0af3947b2db39d.zip | |
Require python/python3-rpm-macros for python/python3 macros
| -rw-r--r-- | macros.python3.4 | 6 | ||||
| -rw-r--r-- | python34.spec | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/macros.python3.4 b/macros.python3.4 deleted file mode 100644 index 0b5f70d..0000000 --- a/macros.python3.4 +++ /dev/null @@ -1,6 +0,0 @@ -%__python3 /usr/bin/python3.4 -%python3_sitelib %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())") -%python3_sitearch %(%{__python3} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") -%python3_version %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3])") -%python3_version_nodots %(%{__python3} -c "import sys; sys.stdout.write(sys.version[:3].replace('.',''))") -%py3dir %{_builddir}/python3-%{name}-%{version}-%{release} diff --git a/python34.spec b/python34.spec index bddbe9e..54ce7a6 100644 --- a/python34.spec +++ b/python34.spec @@ -148,7 +148,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python%{pyshortver} Version: %{pybasever}.3 -Release: 2%{?dist} +Release: 3%{?dist} License: Python Group: Development/Languages @@ -224,10 +224,6 @@ Source1: find-provides-without-python-sonames.sh %global _use_internal_dependency_generator 0 %global __find_provides %{SOURCE1} -# Supply various useful macros for building python 3 modules: -# __python3, python3_sitelib, python3_sitearch -Source2: macros.python%{pybasever} - # Supply an RPM macro "py_byte_compile" for the python3-devel subpackage # to enable specfiles to selectively byte-compile individual files and paths # with different Python runtimes as necessary: @@ -810,6 +806,8 @@ Summary: Libraries and header files needed for Python 3 development Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: python-rpm-macros +Requires: python3-rpm-macros Conflicts: %{name} < %{version}-%{release} %description devel @@ -1396,7 +1394,6 @@ find %{buildroot} \ # Install macros for rpm: mkdir -p %{buildroot}/%{_rpmconfigdir}/macros.d/ -install -m 644 %{SOURCE2} %{buildroot}/%{_rpmconfigdir}/macros.d/ install -m 644 %{SOURCE3} %{buildroot}/%{_rpmconfigdir}/macros.d/ # Ensure that the curses module was linked against libncursesw.so, rather than @@ -1988,6 +1985,9 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Mon Jan 25 2016 Orion Poplawski <orion@cora.nwra.com> - 3.4.3-3 +- Require python/python3-rpm-macros for python/python3 macros + * Thu Jun 11 2015 Matej Stuchlik <mstuchli@redhat.com> - 3.4.3-2 - Review Request fixes |