From cb053c7ab85cc3b209976348c9a95b1d708ed107 Mon Sep 17 00:00:00 2001 From: Thomas Spura Date: Mon, 29 Jun 2015 13:34:22 +0200 Subject: [PATCH] python3-devel: Require python-macros This picks up version independant macros such as python_provide. See fpc#281 and fpc#534 for more details. --- macros.python3 | 10 ++++++++++ python3.spec | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/macros.python3 b/macros.python3 index 395af00..a633c72 100644 --- a/macros.python3 +++ b/macros.python3 @@ -4,3 +4,13 @@ %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}\ +} diff --git a/python3.spec b/python3.spec index 8857301..d418ec2 100644 --- a/python3.spec +++ b/python3.spec @@ -140,7 +140,7 @@ Summary: Version 3 of the Python programming language aka Python 3000 Name: python3 Version: %{pybasever}.2 -Release: 4%{?dist} +Release: 5%{?dist} License: Python Group: Development/Languages @@ -791,10 +791,12 @@ 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 Conflicts: %{name} < %{version}-%{release} %description devel -This package contains libraries and header files used to build applications +This package contains libraries and header files used to build applications with and native libraries for Python 3 %package tools @@ -1890,6 +1892,10 @@ rm -fr %{buildroot} # ====================================================== %changelog +* Mon Jun 29 2015 Thomas Spura - 3.4.2-5 +- python3-devel: Require python-macros for version independant macros such as + python_provide. See fpc#281 and fpc#534. + * Mon Jan 12 2015 Dan HorĂ¡k - 3.4.2-4 - build with valgrind on ppc64le - disable test_gdb on s390(x) until rhbz#1181034 is resolved