From 50ea82423b9de33aa10619c5d1c15de817636466 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sep 06 2019 00:39:33 +0000 Subject: Simplify PYINCLUDE conditional and fix for F31 --- diff --git a/sip.spec b/sip.spec index 4872ce0..0ead999 100644 --- a/sip.spec +++ b/sip.spec @@ -7,10 +7,9 @@ %{!?python2_sitearch:%global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python2_inc:%global python2_inc %(%{__python2} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")} -%if %{fedora} > 30 +%if %{fedora} > 31 %global PYINCLUDE %{_includedir}/python%{python3_version} -%endif -%if %{fedora} <= 30 +%else %global PYINCLUDE %{_includedir}/python%{python3_version}m %endif @@ -31,7 +30,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.18 -Release: 5%{?dist} +Release: 6%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -400,6 +399,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Fri Sep 06 2019 Scott Talbert - 4.19.18-6 +- Simplify PYINCLUDE conditional and fix for F31 + * Wed Aug 28 2019 Gwyn Ciesla 4.19.18-5 - Conditionalize Python 3 include dir.