diff --git a/.gitignore b/.gitignore index c751ad4..2f74dbf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /sip-4.19.6.tar.gz /sip-4.19.7.tar.gz /sip-4.19.8.tar.gz +/sip-4.19.9.dev1805261119.tar.gz diff --git a/sip-4.19.9-python3_ftbfs.patch b/sip-4.19.9-python3_ftbfs.patch new file mode 100644 index 0000000..993af5b --- /dev/null +++ b/sip-4.19.9-python3_ftbfs.patch @@ -0,0 +1,19 @@ +diff -up sip-4.19.9.dev1805261119/siplib/siplib.c.in.rex sip-4.19.9.dev1805261119/siplib/siplib.c.in +--- sip-4.19.9.dev1805261119/siplib/siplib.c.in.rex 2018-05-28 20:30:19.000000000 -0500 ++++ sip-4.19.9.dev1805261119/siplib/siplib.c.in 2018-05-29 11:23:00.868228044 -0500 +@@ -6323,6 +6323,7 @@ static PyObject *createContainerType(sip + if (py_type == NULL) + goto relargs; + ++#if PY_VERSION_HEX >= 0x03030000 + /* Fix __qualname__ if there is a scope. */ + if (scope_td != NULL) + { +@@ -6337,6 +6338,7 @@ static PyObject *createContainerType(sip + Py_CLEAR(ht->ht_qualname); + ht->ht_qualname = qualname; + } ++#endif + + /* Add the type to the "parent" dictionary. */ + if (PyDict_SetItem(scope_dict, name, py_type) < 0) diff --git a/sip.spec b/sip.spec index 8bf2207..5e1db7e 100644 --- a/sip.spec +++ b/sip.spec @@ -19,17 +19,22 @@ # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ %undefine _strict_symbol_defs_build +%global snap dev1805261119 + Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.8 -Release: 3%{?dist} +Version: 4.19.9 +Release: 0.1.%{snap}%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) Url: http://www.riverbankcomputing.com/software/sip/intro #URL: http://sourceforge.net/projects/pyqt/ -Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}%{?snap:-snapshot-%{snap}}.tar.gz -#Source0: http://www.riverbankcomputing.com/static/Downloads/sip4/sip-%{version}.tar.gz +%if 0%{?snap:1} +Source0: https://www.riverbankcomputing.com/static/Downloads/sip/sip-%{version}%{?snap:.%{snap}}.tar.gz +%else +Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}.tar.gz +%endif ## upstream patches @@ -40,6 +45,8 @@ Patch50: sip-4.18-no_strip.patch Patch51: sip-4.18-no_rpath.patch # set sip_bin properly for python3 build (needswork to be upstreamable) Patch52: sip-4.19.3-python3_sip_bin.patch +# fix ftbfs +Patch53: sip-4.19.9-python3_ftbfs.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -126,16 +133,18 @@ classes library. %prep -%setup -q -n %{name}-%{version}%{?snap:-snapshot-%{snap}} +%setup -q -n %{name}-%{version}%{?snap:.%{snap}} %patch50 -p1 -b .no_strip %patch51 -p1 -b .no_rpath +%patch53 -p1 -b .python3_ftbfs %build mkdir %{_target_platform} pushd %{_target_platform} %{__python2} ../configure.py \ + --no-dist-info \ -d %{python2_sitearch} \ CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LFLAGS="%{?__global_ldflags}" @@ -148,6 +157,7 @@ mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 %{__python3} ../configure.py \ -d %{python3_sitearch} \ + --no-dist-info \ --sipdir=%{_datadir}/python3-sip \ CXXFLAGS="%{optflags}" CFLAGS="%{optflags}" LFLAGS="%{?__global_ldflags}" @@ -210,6 +220,10 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Tue May 29 2018 Rex Dieter - 4.19.9-0.1.dev1805261119 +- 4.19.9.dev1805261119 snapshot +- %build: use --no-dist-info, feature not ready + * Thu Mar 15 2018 Sérgio Basto - 4.19.8-3 - Use bcond to handle conditional builds diff --git a/sources b/sources index 64ac95a..3046193 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.8.tar.gz) = 9c0a9722a9a9dd23e2eabe751d622cdd31b376b7987b2c991f5ef4a8d11853c5c6e9f1c24a0d2d864d3990e2a45c2a159ca8511efd4a7e156a14937ef3c680f7 +SHA512 (sip-4.19.9.dev1805261119.tar.gz) = 9fdc9b04b685a85a579c34be66646228cab2850445c52fde5ac66353a3467bf0607d63cf89a26619d37f575f482d3893446294b47818a075ba75ae685992c7ae