diff --git a/.gitignore b/.gitignore index 391aab6..1283264 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /sip-4.19.16.tar.gz /sip-4.19.17.tar.gz /sip-4.19.18.tar.gz +/sip-4.19.19.tar.gz diff --git a/macros.sip b/macros.sip index 2d32a2c..bceeb12 100644 --- a/macros.sip +++ b/macros.sip @@ -1,3 +1,3 @@ %_sip_api_major 12 -%_sip_api_minor 6 +%_sip_api_minor 7 %_sip_api %{_sip_api_major}.%{_sip_api_minor} diff --git a/sip.spec b/sip.spec index 7a0e0fe..314e0a0 100644 --- a/sip.spec +++ b/sip.spec @@ -21,8 +21,6 @@ # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ %undefine _strict_symbol_defs_build -#global snap dev1807041651 - # provide non-namespace python modules # needed by at least some legacy/non-qt consumers, e.g. pykde4 %if 0%{?fedora} < 31 @@ -31,8 +29,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.18 -Release: 7%{?dist} +Version: 4.19.19 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -57,7 +55,7 @@ Patch53: sip-4.19.18-no_hardcode_sip_so.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip %global _sip_api_major 12 -%global _sip_api_minor 6 +%global _sip_api_minor 7 %global _sip_api %{_sip_api_major}.%{_sip_api_minor} BuildRequires: gcc-c++ @@ -66,6 +64,12 @@ BuildRequires: sed Obsoletes: sip-macros < %{version}-%{release} Provides: sip-macros = %{version}-%{release} +# upgrade path when no_namespace variants are dropped +%if ! 0%{?no_namespace} +Obsoletes: python2-sip < %{version}-%{release} +Obsoletes: python3-sip < %{version}-%{release} +%endif + %global _description\ SIP is a tool for generating bindings for C++ classes so that they can be\ accessed as normal Python classes. SIP takes many of its ideas from SWIG but,\ @@ -401,6 +405,10 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Wed Sep 25 2019 Rex Dieter - 4.19.19-1 +- 4.19.19, sip-api(12)=12.7 +- Obsoletes: python2-sip python3-sip (when omitted for f31+) + * Mon Sep 16 2019 Rex Dieter - 4.19.18-7 - drop no_namespace variant for f31+ diff --git a/sources b/sources index 2b3d844..88025cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.18.tar.gz) = e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887 +SHA512 (sip-4.19.19.tar.gz) = 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d