rpms
/
python3
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drop python3 macros, require python/python3-rpm-macros 

Conflicts:
	macros.python3.4
	python3.spec
This commit is contained in:
Orion Poplawski 2016-01-13 12:03:23 -07:00
parent 3fa87d10ec
commit c6dc7288ed
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
macros.python3.4
View File

@ -1,16 +0,0 @@
%__python3 /usr/bin/python3
%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}
%py3_shbang_opts -s
%py3_build() %{expand:\
CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} build --executable="%{__python3} %{py3_shbang_opts}" %{?1}\
}
%py3_install() %{expand:\
CFLAGS="%{optflags}" %{__python3} %{py_setup} %{?py_setup_args} install -O1 --skip-build --root %{buildroot} %{?1}\
}

16
python3.spec
View File

@ -140,7 +140,7 @@
Summary: Version 3 of the Python programming language aka Python 3000
Name: python3
Version: %{pybasever}.3
Release: 5%{?dist}
Release: 6%{?dist}
License: Python
Group: Development/Languages
@ -216,10 +216,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:
@ -803,8 +799,9 @@ Summary: Libraries and header files needed for Python 3 development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: python-macros
Requires: python-macros
BuildRequires: python-rpm-macros
Requires: python-rpm-macros
Requires: python3-rpm-macros
Conflicts: %{name} < %{version}-%{release}
%description devel
@ -1372,7 +1369,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
@ -1756,7 +1752,6 @@ rm -fr %{buildroot}
%{_libdir}/pkgconfig/python-%{LDVERSION_optimized}.pc
%{_libdir}/pkgconfig/python-%{pybasever}.pc
%{_libdir}/pkgconfig/python3.pc
%{_rpmconfigdir}/macros.d/macros.python%{pybasever}
%{_rpmconfigdir}/macros.d/macros.pybytecompile%{pybasever}
%files tools
@ -1920,6 +1915,9 @@ rm -fr %{buildroot}
# ======================================================
%changelog
* Mon Mar 28 2016 Orion Poplwski <orion@cora.nwra.com> - 3.4.3-6
- Drop python3 macros, require python/python3-rpm-macros
* Mon Jun 29 2015 Thomas Spura <tomspur@fedoraproject.org> - 3.4.3-5
- python3-devel: Require python-macros for version independant macros such as
python_provide. See fpc#281 and fpc#534.