From 1a26d4c059ec3c670e78064de7e71cad958ff310 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Thu, 15 Mar 2018 05:55:42 +0000 Subject: [PATCH 01/73] Use bcond to handle conditional builds --- sip.spec | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/sip.spec b/sip.spec index f9305dc..8bf2207 100644 --- a/sip.spec +++ b/sip.spec @@ -1,8 +1,10 @@ %if 0%{?fedora} > 12 || 0%{?rhel} > 6 -%global with_python3 1 +%bcond_without python3 +%else +%bcond_with python3 %endif -%if 0%{?with_python3} +%if %{with python3} %{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")} %endif %{!?__python2:%global __python2 /usr/bin/python2} @@ -20,7 +22,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.8 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -96,11 +98,11 @@ Obsoletes: sip-macros < 4.15.5 BuildArch: noarch %description macros This package contains RPM macros for use when working with SIP. -%if 0%{?with_python3} +%if %{with python3} It is used by both the sip-devel (python 2) and python%{python3_pkgversion}-sip-devel subpackages. %endif -%if 0%{?with_python3} +%if %{with python3} %package -n python%{python3_pkgversion}-sip Summary: SIP - Python 3/C++ Bindings Generator BuildRequires: python%{python3_pkgversion}-devel @@ -140,7 +142,7 @@ pushd %{_target_platform} %make_build popd -%if 0%{?with_python3} +%if %{with python3} patch -p1 < %{PATCH52} mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 @@ -157,7 +159,7 @@ popd %install # Perform the Python 3 installation first, to avoid stomping over the Python 2 # /usr/bin/sip: -%if 0%{?with_python3} +%if %{with python3} %make_install -C %{_target_platform}-python3 mkdir -p %{buildroot}%{_datadir}/python3-sip mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/python3-sip @@ -189,7 +191,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %files macros %{rpm_macros_dir}/macros.sip -%if 0%{?with_python3} +%if %{with python3} %files -n python%{python3_pkgversion}-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 @@ -208,6 +210,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Thu Mar 15 2018 Sérgio Basto - 4.19.8-3 +- Use bcond to handle conditional builds + * Wed Mar 07 2018 Rex Dieter - 4.19.8-2 - BR: gcc-c++, sip-api(12)=12.4 From 6e2cecd066267a4f194942ca9c81727ca60b2e52 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 29 May 2018 12:58:21 -0500 Subject: [PATCH 02/73] 4.19.9.dev1805261119 snapshot %build: use --no-dist-info, feature not ready --- .gitignore | 1 + sip-4.19.9-python3_ftbfs.patch | 19 +++++++++++++++++++ sip.spec | 24 +++++++++++++++++++----- sources | 2 +- 4 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 sip-4.19.9-python3_ftbfs.patch 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 From 2fe233074c3f5993312c5051fa5c35fd87d3bc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 16 Jun 2018 11:25:55 +0200 Subject: [PATCH 03/73] Rebuilt for Python 3.7 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 5e1db7e..a9f345a 100644 --- a/sip.spec +++ b/sip.spec @@ -24,7 +24,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.9 -Release: 0.1.%{snap}%{?dist} +Release: 0.2.%{snap}%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -220,6 +220,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sat Jun 16 2018 Miro Hrončok - 4.19.9-0.2.dev1805261119 +- Rebuilt for Python 3.7 + * 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 From b6e0ae74a974a301156af9c8fb49c62e487159c0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 10 Jul 2018 16:13:09 -0500 Subject: [PATCH 04/73] 4.19.12 --- .gitignore | 1 + sip-4.19.9-python3_ftbfs.patch | 19 ---- sip.spec | 176 ++++++++++++++++++++------------- sources | 2 +- 4 files changed, 111 insertions(+), 87 deletions(-) delete mode 100644 sip-4.19.9-python3_ftbfs.patch diff --git a/.gitignore b/.gitignore index 2f74dbf..5b3057a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /sip-4.19.7.tar.gz /sip-4.19.8.tar.gz /sip-4.19.9.dev1805261119.tar.gz +/sip-4.19.12.tar.gz diff --git a/sip-4.19.9-python3_ftbfs.patch b/sip-4.19.9-python3_ftbfs.patch deleted file mode 100644 index 993af5b..0000000 --- a/sip-4.19.9-python3_ftbfs.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 a9f345a..c101555 100644 --- a/sip.spec +++ b/sip.spec @@ -1,8 +1,4 @@ -%if 0%{?fedora} > 12 || 0%{?rhel} > 6 %bcond_without python3 -%else -%bcond_with python3 -%endif %if %{with python3} %{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")} @@ -19,12 +15,12 @@ # see also https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/JQQ66XJSIT2FGTK2YQY7AXMEH5IXMPUX/ %undefine _strict_symbol_defs_build -%global snap dev1805261119 +#global snap dev1807041651 Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.9 -Release: 0.2.%{snap}%{?dist} +Version: 4.19.12 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -45,8 +41,6 @@ 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 @@ -58,6 +52,9 @@ BuildRequires: gcc-c++ BuildRequires: python2-devel BuildRequires: sed +Obsoletes: sip-macros < %{version}-%{release} +Provides: sip-macros = %{version}-%{release} + %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,\ @@ -75,6 +72,8 @@ class library. Summary: %summary Provides: sip-api(%{_sip_api_major}) = %{_sip_api} Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +Provides: python2-sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: python2-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-sip} # Remove before F30 Provides: sip = %{version}-%{release} @@ -83,31 +82,12 @@ Obsoletes: sip < %{version}-%{release} %description -n python2-sip %_description -%package -n python2-sip-devel -Summary: Files needed to generate Python bindings for any C++ class library -Requires: python2-sip%{?_isa} = %{version}-%{release} -Requires: %{name}-macros = %{version}-%{release} -Requires: python2-devel -# Remove before F30 -Provides: sip-devel = %{version}-%{release} -Provides: sip-devel%{?_isa} = %{version}-%{release} -Obsoletes: sip-devel < %{version}-%{release} - -%description -n python2-sip-devel -This package contains files needed to generate Python bindings for any C++ -classes library. - -%package macros -Summary: RPM macros for use when working with SIP -Requires: rpm -# when arch->noarch happened -Obsoletes: sip-macros < 4.15.5 -BuildArch: noarch -%description macros -This package contains RPM macros for use when working with SIP. -%if %{with python3} -It is used by both the sip-devel (python 2) and python%{python3_pkgversion}-sip-devel subpackages. -%endif +%package -n python2-pyqt5-sip +Summary: %summary +Provides: python2-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: python2-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%{?python_provide:%python_provide python2-pyqt5-sip} +%description -n python2-pyqt5-sip %_description %if %{with python3} %package -n python%{python3_pkgversion}-sip @@ -120,16 +100,38 @@ This is the Python 3 build of SIP. %_description -%package -n python%{python3_pkgversion}-sip-devel -Summary: Files needed to generate Python 3 bindings for any C++ class library -Requires: %{name}-macros = %{version}-%{release} -Requires: python%{python3_pkgversion}-sip%{?_isa} = %{version}-%{release} -Requires: python%{python3_pkgversion}-devel -%description -n python%{python3_pkgversion}-sip-devel -This package contains files needed to generate Python 3 bindings for any C++ -classes library. +%package -n python%{python3_pkgversion}-pyqt5-sip +Summary: SIP - Python 3/C++ Bindings Generator for pyqt5 +BuildRequires: python%{python3_pkgversion}-devel +Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%description -n python%{python3_pkgversion}-pyqt5-sip +This is the Python 3 build of pyqt5-SIP. + +%_description + +%package -n python3-sip-devel +Summary: Files needed to generate Python bindings for any C++ class library +#Requires: python3-sip%{?_isa} = %{version}-%{release} +Requires: python3-devel +%description -n python3-sip-devel +%{summary}. + + %endif +%package -n python2-sip-devel +Summary: Files needed to generate Python bindings for any C++ class library +#Requires: python2-sip%{?_isa} = %{version}-%{release} +Requires: python2-devel +# Remove before F30 +Provides: sip-devel = %{version}-%{release} +Provides: sip-devel%{?_isa} = %{version}-%{release} +Obsoletes: sip-devel < %{version}-%{release} +%description -n python2-sip-devel +%{summary}. + + %prep @@ -137,32 +139,49 @@ classes library. %patch50 -p1 -b .no_strip %patch51 -p1 -b .no_rpath -%patch53 -p1 -b .python3_ftbfs %build -mkdir %{_target_platform} -pushd %{_target_platform} +mkdir %{_target_platform}-python2 +pushd %{_target_platform}-python2 %{__python2} ../configure.py \ --no-dist-info \ - -d %{python2_sitearch} \ - CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" LFLAGS="%{?__global_ldflags}" + CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" + +%make_build +popd + +mkdir %{_target_platform}-python2-pyqt5 +pushd %{_target_platform}-python2-pyqt5 +%{__python2} ../configure.py \ + --no-dist-info \ + --sip-module=PyQt5.sip \ + CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build popd %if %{with python3} -patch -p1 < %{PATCH52} +#patch -p1 < %{PATCH52} 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}" + CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build popd + +mkdir %{_target_platform}-python3-pyqt5 +pushd %{_target_platform}-python3-pyqt5 +%{__python3} ../configure.py \ + --no-dist-info \ + --sip-module=PyQt5.sip \ + CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" + +%make_build +popd + %endif @@ -171,8 +190,7 @@ popd # /usr/bin/sip: %if %{with python3} %make_install -C %{_target_platform}-python3 -mkdir -p %{buildroot}%{_datadir}/python3-sip -mv %{buildroot}%{_bindir}/sip %{buildroot}%{_bindir}/python3-sip +%make_install -C %{_target_platform}-python3-pyqt5 ## toplevel __pycache__ creation is ... inconsistent ## rawhide makes one, f23 local builds do not, so let's *make* it consistent @@ -180,28 +198,40 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %endif # Python 2 installation: -%make_install -C %{_target_platform} +%make_install -C %{_target_platform}-python2 +%make_install -C %{_target_platform}-python2-pyqt5 + mkdir -p %{buildroot}%{_datadir}/sip # Macros used by -devel subpackages: install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip +%files +%doc README +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%{_bindir}/sip +%dir %{_datadir}/sip/ +%{rpm_macros_dir}/macros.sip + +%files -n python2-sip-devel +%{python2_inc}/sip.h + %files -n python2-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python2_sitearch}/sip.so %{python2_sitearch}/sip*.py* -%files -n python2-sip-devel -%{_bindir}/sip -%{_datadir}/sip/ -%{python2_inc}/sip.h - -%files macros -%{rpm_macros_dir}/macros.sip +%files -n python2-pyqt5-sip +%doc NEWS README +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%{python2_sitearch}/PyQt5/ %if %{with python3} +%files -n python%{python3_pkgversion}-sip-devel +%{python3_inc}/sip.h + %files -n python%{python3_pkgversion}-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 @@ -210,16 +240,28 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{python3_sitearch}/__pycache__/* %exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack -%files -n python%{python3_pkgversion}-sip-devel -# Note that the "sip" binary is invoked by name in a few places higher up -# in the KDE-Python stack; these will need changing to "python3-sip": -%{_bindir}/python3-sip -%{_datadir}/python3-sip/ -%{python3_inc}/sip.h +%files -n python%{python3_pkgversion}-pyqt5-sip +%doc NEWS README +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%{python3_sitearch}/PyQt5/ +%{python3_sitearch}/__pycache__/* +%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %endif %changelog +* Tue Jul 10 2018 Rex Dieter - 4.19.12-1 +- 4.19.12 + +* Thu Jul 05 2018 Rex Dieter - 4.19.12-0.1.dev1807041651 +- 4.19.12 snapshot + +* Mon Jul 02 2018 Rex Dieter - 4.19.11-1 +- 4.19.11 + +* Sun Jul 01 2018 Rex Dieter - 4.19.10-1 +- 4.19.10 + * Sat Jun 16 2018 Miro Hrončok - 4.19.9-0.2.dev1805261119 - Rebuilt for Python 3.7 diff --git a/sources b/sources index 3046193..5873bbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.9.dev1805261119.tar.gz) = 9fdc9b04b685a85a579c34be66646228cab2850445c52fde5ac66353a3467bf0607d63cf89a26619d37f575f482d3893446294b47818a075ba75ae685992c7ae +SHA512 (sip-4.19.12.tar.gz) = 9b9680172357aaf4a1ebc3bf1f4d2badaaa8643e50665fed6e17d27283a499ceac56c4f1db190de4d9516c8f0f794159485cc6f8fd68daafcbe1ccac85161972 From c9dadca697bd4af9a0dbf59bd0e9c361bacea7b6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 11 Jul 2018 09:27:51 -0500 Subject: [PATCH 05/73] *-devel: Requires: sip. drop Obsoletes: sip, now that we have a real sip pkg again --- sip.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sip.spec b/sip.spec index c101555..9410500 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -75,11 +75,6 @@ Provides: sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} Provides: python2-sip-api(%{_sip_api_major}) = %{_sip_api} Provides: python2-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-sip} -# Remove before F30 -Provides: sip = %{version}-%{release} -Provides: sip%{?_isa} = %{version}-%{release} -Obsoletes: sip < %{version}-%{release} - %description -n python2-sip %_description %package -n python2-pyqt5-sip @@ -112,16 +107,17 @@ This is the Python 3 build of pyqt5-SIP. %package -n python3-sip-devel Summary: Files needed to generate Python bindings for any C++ class library +Requires: sip = %{version}-%{release} #Requires: python3-sip%{?_isa} = %{version}-%{release} Requires: python3-devel %description -n python3-sip-devel %{summary}. - %endif %package -n python2-sip-devel Summary: Files needed to generate Python bindings for any C++ class library +Requires: sip = %{version}-%{release} #Requires: python2-sip%{?_isa} = %{version}-%{release} Requires: python2-devel # Remove before F30 @@ -250,6 +246,10 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Wed Jul 11 2018 Rex Dieter - 4.19.12-2 +- *-devel: Requires: sip. +- drop Obsoletes: sip, now that we have a real sip pkg again + * Tue Jul 10 2018 Rex Dieter - 4.19.12-1 - 4.19.12 From 1e0a7a236e6189b25989b9726bbf05fd8e202af2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 06:12:41 +0000 Subject: [PATCH 06/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 9410500..576b47c 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -246,6 +246,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 4.19.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Wed Jul 11 2018 Rex Dieter - 4.19.12-2 - *-devel: Requires: sip. - drop Obsoletes: sip, now that we have a real sip pkg again From 067025efa02eb44583e0bc9c33e17288abfb74a9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 15 Jul 2018 10:49:34 -0500 Subject: [PATCH 07/73] sip-api(12)=12.5 --- macros.sip | 2 +- sip.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/macros.sip b/macros.sip index 3c5b185..6e07e48 100644 --- a/macros.sip +++ b/macros.sip @@ -1,3 +1,3 @@ %_sip_api_major 12 -%_sip_api_minor 4 +%_sip_api_minor 5 %_sip_api %{_sip_api_major}.%{_sip_api_minor} diff --git a/sip.spec b/sip.spec index 576b47c..d3c265e 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -45,7 +45,7 @@ Patch52: sip-4.19.3-python3_sip_bin.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 4 +%global _sip_api_minor 5 %global _sip_api %{_sip_api_major}.%{_sip_api_minor} BuildRequires: gcc-c++ @@ -246,6 +246,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sun Jul 15 2018 Rex Dieter - 4.19.12-4 +- sip-api(12)=12.5 + * Sat Jul 14 2018 Fedora Release Engineering - 4.19.12-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 9283f89ddd4da33d5a169dc2d820a238183612bd Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 Jul 2018 09:42:17 -0500 Subject: [PATCH 08/73] python?-devel: Requires: python?-sip add python3-sip compat symlink --- sip.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sip.spec b/sip.spec index d3c265e..98c6912 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 4%{?dist} +Release: 5%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -108,7 +108,7 @@ This is the Python 3 build of pyqt5-SIP. %package -n python3-sip-devel Summary: Files needed to generate Python bindings for any C++ class library Requires: sip = %{version}-%{release} -#Requires: python3-sip%{?_isa} = %{version}-%{release} +Requires: python3-sip%{?_isa} = %{version}-%{release} Requires: python3-devel %description -n python3-sip-devel %{summary}. @@ -118,7 +118,7 @@ Requires: python3-devel %package -n python2-sip-devel Summary: Files needed to generate Python bindings for any C++ class library Requires: sip = %{version}-%{release} -#Requires: python2-sip%{?_isa} = %{version}-%{release} +Requires: python2-sip%{?_isa} = %{version}-%{release} Requires: python2-devel # Remove before F30 Provides: sip-devel = %{version}-%{release} @@ -186,6 +186,7 @@ popd # /usr/bin/sip: %if %{with python3} %make_install -C %{_target_platform}-python3 +ln -s sip %{buildroot}%{_bindir}/python3-sip %make_install -C %{_target_platform}-python3-pyqt5 ## toplevel __pycache__ creation is ... inconsistent @@ -207,6 +208,8 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %doc README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{_bindir}/sip +# compat symlink +%{_bindir}/python3-sip %dir %{_datadir}/sip/ %{rpm_macros_dir}/macros.sip @@ -246,6 +249,10 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Mon Jul 16 2018 Rex Dieter - 4.19.12-5 +- python?-devel: Requires: python?-sip +- add python3-sip compat symlink + * Sun Jul 15 2018 Rex Dieter - 4.19.12-4 - sip-api(12)=12.5 From 1c807c07c4fe043ae45f7d5658479efb9949a11e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Aug 2018 09:08:34 -0500 Subject: [PATCH 09/73] provide python?-pyqt4-sip too tighten dir ownership of sip python module dir(s) --- sip.spec | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 7 deletions(-) diff --git a/sip.spec b/sip.spec index 98c6912..789c9c9 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 5%{?dist} +Release: 6%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -77,6 +77,13 @@ Provides: python2-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-sip} %description -n python2-sip %_description +%package -n python2-pyqt4-sip +Summary: %summary +Provides: python2-pyqt4-sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: python2-pyqt4-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%{?python_provide:%python_provide python2-pyqt4-sip} +%description -n python2-pyqt4-sip %_description + %package -n python2-pyqt5-sip Summary: %summary Provides: python2-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_api} @@ -95,6 +102,14 @@ This is the Python 3 build of SIP. %_description +%package -n python%{python3_pkgversion}-pyqt4-sip +Summary: SIP - Python 3/C++ Bindings Generator for pyqt4 +BuildRequires: python%{python3_pkgversion}-devel +Provides: python%{python3_pkgversion}-pyqt4-sip-api(%{_sip_api_major}) = %{_sip_api} +Provides: python%{python3_pkgversion}-pyqt4-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%description -n python%{python3_pkgversion}-pyqt4-sip +This is the Python 3 build of pyqt4-SIP. + %package -n python%{python3_pkgversion}-pyqt5-sip Summary: SIP - Python 3/C++ Bindings Generator for pyqt5 BuildRequires: python%{python3_pkgversion}-devel @@ -147,6 +162,16 @@ pushd %{_target_platform}-python2 %make_build popd +mkdir %{_target_platform}-python2-pyqt4 +pushd %{_target_platform}-python2-pyqt4 +%{__python2} ../configure.py \ + --no-dist-info \ + --sip-module=PyQt4.sip \ + CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" + +%make_build +popd + mkdir %{_target_platform}-python2-pyqt5 pushd %{_target_platform}-python2-pyqt5 %{__python2} ../configure.py \ @@ -168,6 +193,16 @@ pushd %{_target_platform}-python3 %make_build popd +mkdir %{_target_platform}-python3-pyqt4 +pushd %{_target_platform}-python3-pyqt4 +%{__python3} ../configure.py \ + --no-dist-info \ + --sip-module=PyQt4.sip \ + CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" + +%make_build +popd + mkdir %{_target_platform}-python3-pyqt5 pushd %{_target_platform}-python3-pyqt5 %{__python3} ../configure.py \ @@ -187,6 +222,7 @@ popd %if %{with python3} %make_install -C %{_target_platform}-python3 ln -s sip %{buildroot}%{_bindir}/python3-sip +%make_install -C %{_target_platform}-python3-pyqt4 %make_install -C %{_target_platform}-python3-pyqt5 ## toplevel __pycache__ creation is ... inconsistent @@ -196,6 +232,7 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack # Python 2 installation: %make_install -C %{_target_platform}-python2 +%make_install -C %{_target_platform}-python2-pyqt4 %make_install -C %{_target_platform}-python2-pyqt5 mkdir -p %{buildroot}%{_datadir}/sip @@ -219,13 +256,20 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %files -n python2-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 -%{python2_sitearch}/sip.so -%{python2_sitearch}/sip*.py* +%{python2_sitearch}/sip.* +%{python2_sitearch}/sipconfig.py* +%{python2_sitearch}/sipdistutils.py* + +%files -n python2-pyqt4-sip +%doc NEWS README +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%{python2_sitearch}/PyQt4/ %files -n python2-pyqt5-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 -%{python2_sitearch}/PyQt5/ +%dir %{python2_sitearch}/PyQt5/ +%{python2_sitearch}/PyQt5/sip.* %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel @@ -234,21 +278,35 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %files -n python%{python3_pkgversion}-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 -%{python3_sitearch}/sip.so -%{python3_sitearch}/sip*.py* +%{python3_sitearch}/sip.* +%{python3_sitearch}/sipconfig.py* +%{python3_sitearch}/sipdistutils.py* +%{python3_sitearch}/__pycache__/* +%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack + +%files -n python%{python3_pkgversion}-pyqt4-sip +%doc NEWS README +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%dir %{python3_sitearch}/PyQt4/ +%{python3_sitearch}/PyQt4/sip.* %{python3_sitearch}/__pycache__/* %exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python%{python3_pkgversion}-pyqt5-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 -%{python3_sitearch}/PyQt5/ +%dir %{python3_sitearch}/PyQt5/ +%{python3_sitearch}/PyQt5/sip.* %{python3_sitearch}/__pycache__/* %exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %endif %changelog +* Tue Aug 14 2018 Rex Dieter - 4.19.12-6 +- provide python?-pyqt4-sip too +- tighten dir ownership of sip python module dir(s) + * Mon Jul 16 2018 Rex Dieter - 4.19.12-5 - python?-devel: Requires: python?-sip - add python3-sip compat symlink From 62210af1938f5b0ea6e3f76970a4d87ad1b818e4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 14 Aug 2018 11:03:01 -0500 Subject: [PATCH 10/73] include dist-info (#1524189) --- sip.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/sip.spec b/sip.spec index 789c9c9..e74f5a7 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 6%{?dist} +Release: 7%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -156,7 +156,6 @@ Obsoletes: sip-devel < %{version}-%{release} mkdir %{_target_platform}-python2 pushd %{_target_platform}-python2 %{__python2} ../configure.py \ - --no-dist-info \ CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -165,7 +164,6 @@ popd mkdir %{_target_platform}-python2-pyqt4 pushd %{_target_platform}-python2-pyqt4 %{__python2} ../configure.py \ - --no-dist-info \ --sip-module=PyQt4.sip \ CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" @@ -175,7 +173,6 @@ popd mkdir %{_target_platform}-python2-pyqt5 pushd %{_target_platform}-python2-pyqt5 %{__python2} ../configure.py \ - --no-dist-info \ --sip-module=PyQt5.sip \ CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" @@ -187,7 +184,6 @@ popd mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 %{__python3} ../configure.py \ - --no-dist-info \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -196,7 +192,6 @@ popd mkdir %{_target_platform}-python3-pyqt4 pushd %{_target_platform}-python3-pyqt4 %{__python3} ../configure.py \ - --no-dist-info \ --sip-module=PyQt4.sip \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" @@ -206,7 +201,6 @@ popd mkdir %{_target_platform}-python3-pyqt5 pushd %{_target_platform}-python3-pyqt5 %{__python3} ../configure.py \ - --no-dist-info \ --sip-module=PyQt5.sip \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" @@ -259,17 +253,20 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{python2_sitearch}/sip.* %{python2_sitearch}/sipconfig.py* %{python2_sitearch}/sipdistutils.py* +%{python2_sitearch}/sip-%{version}.dist-info/ %files -n python2-pyqt4-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python2_sitearch}/PyQt4/ +%{python2_sitearch}/PyQt4_sip-%{version}.dist-info/ %files -n python2-pyqt5-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %dir %{python2_sitearch}/PyQt5/ %{python2_sitearch}/PyQt5/sip.* +%{python2_sitearch}/PyQt5_sip-%{version}.dist-info/ %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel @@ -281,6 +278,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{python3_sitearch}/sip.* %{python3_sitearch}/sipconfig.py* %{python3_sitearch}/sipdistutils.py* +%{python3_sitearch}/sip-%{version}.dist-info/ %{python3_sitearch}/__pycache__/* %exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack @@ -289,6 +287,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %dir %{python3_sitearch}/PyQt4/ %{python3_sitearch}/PyQt4/sip.* +%{python3_sitearch}/PyQt4_sip-%{version}.dist-info/ %{python3_sitearch}/__pycache__/* %exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack @@ -297,12 +296,16 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %dir %{python3_sitearch}/PyQt5/ %{python3_sitearch}/PyQt5/sip.* +%{python3_sitearch}/PyQt5_sip-%{version}.dist-info/ %{python3_sitearch}/__pycache__/* %exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %endif %changelog +* Tue Aug 14 2018 Rex Dieter - 4.19.12-7 +- include dist-info (#1524189) + * Tue Aug 14 2018 Rex Dieter - 4.19.12-6 - provide python?-pyqt4-sip too - tighten dir ownership of sip python module dir(s) From 16f9a7446d84e81c392b2bedd3cdacc4ff558463 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 24 Aug 2018 11:31:21 -0500 Subject: [PATCH 11/73] -devel: move sipconfig/sipdistutils here -devel: drop dep on non-private base pkg (which may go away soon anyway) -devel: move subpkg defs nearer its basepkg in .spec (more) consistently use %python3_pkgversion drop (uneeded) python3_sip_bin.patch --- sip.spec | 73 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 42 insertions(+), 31 deletions(-) diff --git a/sip.spec b/sip.spec index e74f5a7..1e62ad5 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 7%{?dist} +Release: 8%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -40,7 +40,8 @@ Patch50: sip-4.18-no_strip.patch # try not to rpath the world (I *think* this may not be required anymore, since sip-4.19 -- rex) 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 +# no longer needed? keep for a little while before dropping completely -- rex +#Patch52: sip-4.19.3-python3_sip_bin.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -49,7 +50,6 @@ Source1: macros.sip %global _sip_api %{_sip_api_major}.%{_sip_api_minor} BuildRequires: gcc-c++ -BuildRequires: python2-devel BuildRequires: sed Obsoletes: sip-macros < %{version}-%{release} @@ -68,6 +68,8 @@ class library. %description %_description +# theoretically, nothing should be using a non-private sip anymore +# may drop this subpkg at some point. %package -n python2-sip Summary: %summary Provides: sip-api(%{_sip_api_major}) = %{_sip_api} @@ -77,6 +79,19 @@ Provides: python2-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-sip} %description -n python2-sip %_description +%package -n python2-sip-devel +Summary: Files needed to generate Python bindings for any C++ class library +Requires: sip = %{version}-%{release} +#Requires: python2-sip%{?_isa} = %{version}-%{release} +BuildRequires: python2-devel +Requires: python2-devel +# Remove before F30 +Provides: sip-devel = %{version}-%{release} +Provides: sip-devel%{?_isa} = %{version}-%{release} +Obsoletes: sip-devel < %{version}-%{release} +%description -n python2-sip-devel +%{summary}. + %package -n python2-pyqt4-sip Summary: %summary Provides: python2-pyqt4-sip-api(%{_sip_api_major}) = %{_sip_api} @@ -92,9 +107,10 @@ Provides: python2-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python2-pyqt5-sip %_description %if %{with python3} +# theoretically, nothing should be using a non-private sip anymore +# may drop this subpkg at some point. %package -n python%{python3_pkgversion}-sip Summary: SIP - Python 3/C++ Bindings Generator -BuildRequires: python%{python3_pkgversion}-devel Provides: python%{python3_pkgversion}-sip-api(%{_sip_api_major}) = %{_sip_api} Provides: python%{python3_pkgversion}-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python%{python3_pkgversion}-sip @@ -102,6 +118,15 @@ This is the Python 3 build of SIP. %_description +%package -n python%{python3_pkgversion}-sip-devel +Summary: Files needed to generate Python bindings for any C++ class library +Requires: sip = %{version}-%{release} +#Requires: python3-sip%{?_isa} = %{version}-%{release} +BuildRequires: python%{python3_pkgversion}-devel +Requires: python%{python3_pkgversion}-devel +%description -n python%{python3_pkgversion}-sip-devel +%{summary}. + %package -n python%{python3_pkgversion}-pyqt4-sip Summary: SIP - Python 3/C++ Bindings Generator for pyqt4 BuildRequires: python%{python3_pkgversion}-devel @@ -120,29 +145,8 @@ This is the Python 3 build of pyqt5-SIP. %_description -%package -n python3-sip-devel -Summary: Files needed to generate Python bindings for any C++ class library -Requires: sip = %{version}-%{release} -Requires: python3-sip%{?_isa} = %{version}-%{release} -Requires: python3-devel -%description -n python3-sip-devel -%{summary}. - %endif -%package -n python2-sip-devel -Summary: Files needed to generate Python bindings for any C++ class library -Requires: sip = %{version}-%{release} -Requires: python2-sip%{?_isa} = %{version}-%{release} -Requires: python2-devel -# Remove before F30 -Provides: sip-devel = %{version}-%{release} -Provides: sip-devel%{?_isa} = %{version}-%{release} -Obsoletes: sip-devel < %{version}-%{release} -%description -n python2-sip-devel -%{summary}. - - %prep @@ -246,13 +250,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %files -n python2-sip-devel %{python2_inc}/sip.h +%{python2_sitearch}/sipconfig.py* +%{python2_sitearch}/sipdistutils.py* %files -n python2-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python2_sitearch}/sip.* -%{python2_sitearch}/sipconfig.py* -%{python2_sitearch}/sipdistutils.py* %{python2_sitearch}/sip-%{version}.dist-info/ %files -n python2-pyqt4-sip @@ -271,16 +275,16 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel %{python3_inc}/sip.h +%{python3_sitearch}/sipconfig.py* +%{python3_sitearch}/sipdistutils.py* +%{python3_sitearch}/__pycache__/* +%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python%{python3_pkgversion}-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python3_sitearch}/sip.* -%{python3_sitearch}/sipconfig.py* -%{python3_sitearch}/sipdistutils.py* %{python3_sitearch}/sip-%{version}.dist-info/ -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python%{python3_pkgversion}-pyqt4-sip %doc NEWS README @@ -303,6 +307,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Fri Aug 24 2018 Rex Dieter - 4.19.12-8 +- -devel: move sipconfig/sipdistutils here +- -devel: drop dep on non-private base pkg (which may go away soon anyway) +- -devel: move subpkg defs nearer its basepkg in .spec +- (more) consistently use %%python3_pkgversion +- drop (uneeded) python3_sip_bin.patch + * Tue Aug 14 2018 Rex Dieter - 4.19.12-7 - include dist-info (#1524189) From b2d03ad90d074f7bd89a446b44a7f23ed8957ec2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 26 Aug 2018 09:37:17 -0500 Subject: [PATCH 12/73] include sip-pyqt4/sip-pyqt5 wrappers --- sip-wrapper.sh | 3 +++ sip.spec | 16 +++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 sip-wrapper.sh diff --git a/sip-wrapper.sh b/sip-wrapper.sh new file mode 100644 index 0000000..d7d3751 --- /dev/null +++ b/sip-wrapper.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +exec sip -n @SIP_MODULE@ $@ diff --git a/sip.spec b/sip.spec index 1e62ad5..08b2f62 100644 --- a/sip.spec +++ b/sip.spec @@ -20,7 +20,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.12 -Release: 8%{?dist} +Release: 9%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -32,6 +32,8 @@ Source0: https://www.riverbankcomputing.com/static/Downloads/sip/sip-%{version} Source0: http://downloads.sourceforge.net/pyqt/sip-%{version}.tar.gz %endif +Source10: sip-wrapper.sh + ## upstream patches ## upstreamable patches @@ -233,6 +235,12 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %make_install -C %{_target_platform}-python2-pyqt4 %make_install -C %{_target_platform}-python2-pyqt5 +# sip-wrapper +install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt4 +install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt5 +sed -i -e 's|@SIP_MODULE@|PyQt4.sip|g' %{buildroot}%{_bindir}/sip-pyqt4 +sed -i -e 's|@SIP_MODULE@|PyQt5.sip|g' %{buildroot}%{_bindir}/sip-pyqt5 + mkdir -p %{buildroot}%{_datadir}/sip # Macros used by -devel subpackages: @@ -243,6 +251,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %doc README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{_bindir}/sip +# sip-wrappers +%{_bindir}/sip-pyqt4 +%{_bindir}/sip-pyqt5 # compat symlink %{_bindir}/python3-sip %dir %{_datadir}/sip/ @@ -307,6 +318,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sun Aug 26 2018 Rex Dieter - 4.19.12-9 +- include sip-pyqt4/sip-pyqt5 wrappers + * Fri Aug 24 2018 Rex Dieter - 4.19.12-8 - -devel: move sipconfig/sipdistutils here - -devel: drop dep on non-private base pkg (which may go away soon anyway) From c17e1e6b4925f017028076ed90153ebb03f1a5c4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 3 Oct 2018 08:10:21 -0500 Subject: [PATCH 13/73] 4.19.3 drop non-namespaced python-sip modules FIXME/TODO: add Obsoletes somewhere --- .gitignore | 1 + sip.spec | 33 +++++++++++++++++++++++++++------ sources | 2 +- 3 files changed, 29 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5b3057a..1e2f99d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /sip-4.19.8.tar.gz /sip-4.19.9.dev1805261119.tar.gz /sip-4.19.12.tar.gz +/sip-4.19.13.tar.gz diff --git a/sip.spec b/sip.spec index 08b2f62..f4c0552 100644 --- a/sip.spec +++ b/sip.spec @@ -17,10 +17,13 @@ #global snap dev1807041651 +# provide non-namespace python modules +#global no_namespace 1 + Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.12 -Release: 9%{?dist} +Version: 4.19.13 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -70,6 +73,7 @@ class library. %description %_description +%if 0%{?no_namespace} # theoretically, nothing should be using a non-private sip anymore # may drop this subpkg at some point. %package -n python2-sip @@ -80,6 +84,7 @@ Provides: python2-sip-api(%{_sip_api_major}) = %{_sip_api} Provides: python2-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-sip} %description -n python2-sip %_description +%endif %package -n python2-sip-devel Summary: Files needed to generate Python bindings for any C++ class library @@ -109,8 +114,7 @@ Provides: python2-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python2-pyqt5-sip %_description %if %{with python3} -# theoretically, nothing should be using a non-private sip anymore -# may drop this subpkg at some point. +%if 0%{?no_namespace} %package -n python%{python3_pkgversion}-sip Summary: SIP - Python 3/C++ Bindings Generator Provides: python%{python3_pkgversion}-sip-api(%{_sip_api_major}) = %{_sip_api} @@ -119,6 +123,7 @@ Provides: python%{python3_pkgversion}-sip-api(%{_sip_api_major})%{?_isa} = %{_si This is the Python 3 build of SIP. %_description +%endif %package -n python%{python3_pkgversion}-sip-devel Summary: Files needed to generate Python bindings for any C++ class library @@ -159,6 +164,7 @@ This is the Python 3 build of pyqt5-SIP. %build +%if 0%{?no_namespace} mkdir %{_target_platform}-python2 pushd %{_target_platform}-python2 %{__python2} ../configure.py \ @@ -166,6 +172,7 @@ pushd %{_target_platform}-python2 %make_build popd +%endif mkdir %{_target_platform}-python2-pyqt4 pushd %{_target_platform}-python2-pyqt4 @@ -186,7 +193,7 @@ pushd %{_target_platform}-python2-pyqt5 popd %if %{with python3} -#patch -p1 < %{PATCH52} +%if 0%{?no_namespace} mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 %{__python3} ../configure.py \ @@ -194,6 +201,7 @@ pushd %{_target_platform}-python3 %make_build popd +%endif mkdir %{_target_platform}-python3-pyqt4 pushd %{_target_platform}-python3-pyqt4 @@ -220,10 +228,12 @@ popd # Perform the Python 3 installation first, to avoid stomping over the Python 2 # /usr/bin/sip: %if %{with python3} +%if 0%{?no_namespace} %make_install -C %{_target_platform}-python3 -ln -s sip %{buildroot}%{_bindir}/python3-sip +%endif %make_install -C %{_target_platform}-python3-pyqt4 %make_install -C %{_target_platform}-python3-pyqt5 +ln -s sip %{buildroot}%{_bindir}/python3-sip ## toplevel __pycache__ creation is ... inconsistent ## rawhide makes one, f23 local builds do not, so let's *make* it consistent @@ -231,7 +241,9 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %endif # Python 2 installation: +%if 0%{?no_namespace} %make_install -C %{_target_platform}-python2 +%endif %make_install -C %{_target_platform}-python2-pyqt4 %make_install -C %{_target_platform}-python2-pyqt5 @@ -264,11 +276,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{python2_sitearch}/sipconfig.py* %{python2_sitearch}/sipdistutils.py* +%if 0%{?no_namespace} %files -n python2-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python2_sitearch}/sip.* %{python2_sitearch}/sip-%{version}.dist-info/ +%endif %files -n python2-pyqt4-sip %doc NEWS README @@ -291,11 +305,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{python3_sitearch}/__pycache__/* %exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack +%if 0%{?no_namespace} %files -n python%{python3_pkgversion}-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %{python3_sitearch}/sip.* %{python3_sitearch}/sip-%{version}.dist-info/ +%endif %files -n python%{python3_pkgversion}-pyqt4-sip %doc NEWS README @@ -318,6 +334,11 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Wed Oct 03 2018 Rex Dieter - 4.19.13-1 +- 4.19.3 +- drop non-namespaced python-sip modules +- FIXME/TODO: add Obsoletes somewhere + * Sun Aug 26 2018 Rex Dieter - 4.19.12-9 - include sip-pyqt4/sip-pyqt5 wrappers diff --git a/sources b/sources index 5873bbd..accf137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.12.tar.gz) = 9b9680172357aaf4a1ebc3bf1f4d2badaaa8643e50665fed6e17d27283a499ceac56c4f1db190de4d9516c8f0f794159485cc6f8fd68daafcbe1ccac85161972 +SHA512 (sip-4.19.13.tar.gz) = eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98 From d748be461b11e85c3eaa93e8e3862020249e89a8 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Wed, 24 Oct 2018 12:54:42 +0200 Subject: [PATCH 14/73] Fix python3 subpackages files ownership within __pycache__ (#1619099) --- sip.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sip.spec b/sip.spec index f4c0552..35485ff 100644 --- a/sip.spec +++ b/sip.spec @@ -23,7 +23,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.13 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -319,8 +319,6 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %dir %{python3_sitearch}/PyQt4/ %{python3_sitearch}/PyQt4/sip.* %{python3_sitearch}/PyQt4_sip-%{version}.dist-info/ -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %files -n python%{python3_pkgversion}-pyqt5-sip %doc NEWS README @@ -328,12 +326,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %dir %{python3_sitearch}/PyQt5/ %{python3_sitearch}/PyQt5/sip.* %{python3_sitearch}/PyQt5_sip-%{version}.dist-info/ -%{python3_sitearch}/__pycache__/* -%exclude %{python3_sitearch}/__pycache__/exclude_rpm_hack %endif %changelog +* Wed Oct 24 2018 Than Ngo - 4.19.13-2 +- Fix python3 subpackages files ownership within __pycache__ (#1619099) + * Wed Oct 03 2018 Rex Dieter - 4.19.13-1 - 4.19.3 - drop non-namespaced python-sip modules From e2234ac191766b2a83726436f076478733c627a1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 28 Oct 2018 00:45:26 -0500 Subject: [PATCH 15/73] restore non-namespaced python-sip module --- sip.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sip.spec b/sip.spec index 35485ff..778ee4a 100644 --- a/sip.spec +++ b/sip.spec @@ -18,12 +18,13 @@ #global snap dev1807041651 # provide non-namespace python modules -#global no_namespace 1 +# needed by at least some non-qt consumers, e.g. wxpython4 +%global no_namespace 1 Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.13 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -74,8 +75,6 @@ class library. %description %_description %if 0%{?no_namespace} -# theoretically, nothing should be using a non-private sip anymore -# may drop this subpkg at some point. %package -n python2-sip Summary: %summary Provides: sip-api(%{_sip_api_major}) = %{_sip_api} @@ -330,6 +329,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sun Oct 28 2018 Rex Dieter - 4.19.13-3 +- restore non-namespaced python-sip module + * Wed Oct 24 2018 Than Ngo - 4.19.13-2 - Fix python3 subpackages files ownership within __pycache__ (#1619099) From 54e158b0a74729c5c1b8e9857ab3a6a2a7e57d56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 15:31:23 +0000 Subject: [PATCH 16/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 778ee4a..ffe78e3 100644 --- a/sip.spec +++ b/sip.spec @@ -24,7 +24,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.13 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -329,6 +329,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 4.19.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sun Oct 28 2018 Rex Dieter - 4.19.13-3 - restore non-namespaced python-sip module From 13c08eecade6d4552298ddced7fc677786942232 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 21 Mar 2019 20:38:51 -0500 Subject: [PATCH 17/73] 4.19.15, - sip-api(12)=12.6 --- .gitignore | 1 + macros.sip | 2 +- sip.spec | 14 ++++++-------- sources | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 1e2f99d..7d818bd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /sip-4.19.9.dev1805261119.tar.gz /sip-4.19.12.tar.gz /sip-4.19.13.tar.gz +/sip-4.19.15.tar.gz diff --git a/macros.sip b/macros.sip index 6e07e48..2d32a2c 100644 --- a/macros.sip +++ b/macros.sip @@ -1,3 +1,3 @@ %_sip_api_major 12 -%_sip_api_minor 5 +%_sip_api_minor 6 %_sip_api %{_sip_api_major}.%{_sip_api_minor} diff --git a/sip.spec b/sip.spec index ffe78e3..9dba836 100644 --- a/sip.spec +++ b/sip.spec @@ -23,18 +23,13 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.13 -Release: 4%{?dist} +Version: 4.19.15 +Release: 1%{?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/ -%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 Source10: sip-wrapper.sh @@ -52,7 +47,7 @@ Patch51: sip-4.18-no_rpath.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 5 +%global _sip_api_minor 6 %global _sip_api %{_sip_api_major}.%{_sip_api_minor} BuildRequires: gcc-c++ @@ -329,6 +324,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Thu Mar 21 2019 Rex Dieter - 4.19.15-1 +- 4.19.15, - sip-api(12)=12.6 + * Sat Feb 02 2019 Fedora Release Engineering - 4.19.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index accf137..75a6c8e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.13.tar.gz) = eb456e1f7efa463f859047acc5301e19279e1627629d0bad3ac7a0a52b77575126bc3f2c64bb4278ae11d415c13d2731dfc8c816bba71307173d393a414aae98 +SHA512 (sip-4.19.15.tar.gz) = 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422 From 6acf967ef715c8c628b5921776c1d312baf0bce5 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 11 Apr 2019 08:19:34 -0500 Subject: [PATCH 18/73] 4.19.16 --- .gitignore | 1 + sip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7d818bd..41ef778 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /sip-4.19.12.tar.gz /sip-4.19.13.tar.gz /sip-4.19.15.tar.gz +/sip-4.19.16.tar.gz diff --git a/sip.spec b/sip.spec index 9dba836..46fce80 100644 --- a/sip.spec +++ b/sip.spec @@ -23,13 +23,13 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.15 +Version: 4.19.16 Release: 1%{?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 -Source0: https://www.riverbankcomputing.com/static/Downloads/sip/sip-%{version}%{?snap:.%{snap}}.tar.gz +Source0: https://www.riverbankcomputing.com/static/Downloads/sip/%{version}/sip-%{version}%{?snap:.%{snap}}.tar.gz Source10: sip-wrapper.sh @@ -324,6 +324,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Thu Apr 11 2019 Rex Dieter - 4.19.16-1 +- 4.19.16 + * Thu Mar 21 2019 Rex Dieter - 4.19.15-1 - 4.19.15, - sip-api(12)=12.6 diff --git a/sources b/sources index 75a6c8e..b917c78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.15.tar.gz) = 9518a5e90d54758b13dd8752669d4deb175cea8d8cdf810deaf554cd157d32ab7e394d23c774993fac3b7c02d56445b80962457d59f5cda543917a0251816422 +SHA512 (sip-4.19.16.tar.gz) = 6a4e3e8580e914544c9037db61ab9cf05e2460cf2dbdeb67d30c949aa150952d2bb337061f7c7a9222251b04f83a1db1554ff576c3e83b8f60851b442133befa From 71abe04177a08fbb1e325cf491d6e5a6a6f5dba8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 6 May 2019 14:02:37 -0500 Subject: [PATCH 19/73] 4.19.17 --- .gitignore | 1 + sip.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 41ef778..ae85f06 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /sip-4.19.13.tar.gz /sip-4.19.15.tar.gz /sip-4.19.16.tar.gz +/sip-4.19.17.tar.gz diff --git a/sip.spec b/sip.spec index 46fce80..a62b78d 100644 --- a/sip.spec +++ b/sip.spec @@ -23,7 +23,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.16 +Version: 4.19.17 Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) @@ -324,6 +324,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Mon May 06 2019 Rex Dieter - 4.19.17-1 +- 4.19.17 + * Thu Apr 11 2019 Rex Dieter - 4.19.16-1 - 4.19.16 diff --git a/sources b/sources index b917c78..b07efa7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.16.tar.gz) = 6a4e3e8580e914544c9037db61ab9cf05e2460cf2dbdeb67d30c949aa150952d2bb337061f7c7a9222251b04f83a1db1554ff576c3e83b8f60851b442133befa +SHA512 (sip-4.19.17.tar.gz) = d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb From abd3d929a27a4b5e2a23a375ec50c19452259e5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 23:25:32 +0000 Subject: [PATCH 20/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index a62b78d..d3ecdf8 100644 --- a/sip.spec +++ b/sip.spec @@ -24,7 +24,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.17 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -324,6 +324,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 4.19.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon May 06 2019 Rex Dieter - 4.19.17-1 - 4.19.17 From 87a0446bdc59bfdb60d05d65607ca0beea09aae1 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 4 Aug 2019 07:02:52 -0500 Subject: [PATCH 21/73] 4.19.18 --- .gitignore | 1 + sip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ae85f06..391aab6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /sip-4.19.15.tar.gz /sip-4.19.16.tar.gz /sip-4.19.17.tar.gz +/sip-4.19.18.tar.gz diff --git a/sip.spec b/sip.spec index d3ecdf8..c7f551b 100644 --- a/sip.spec +++ b/sip.spec @@ -23,8 +23,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.17 -Release: 2%{?dist} +Version: 4.19.18 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -324,6 +324,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sun Aug 04 2019 Rex Dieter - 4.19.18-1 +- 4.19.18 + * Fri Jul 26 2019 Fedora Release Engineering - 4.19.17-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index b07efa7..2b3d844 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.17.tar.gz) = d393cfc1643663926bd315a8df92abd82bec071bf0488b047625bdac43e9074bc8a510ac23244a7a2d2d181f70af9691db9d0b759e79643981d6afd71a49d3cb +SHA512 (sip-4.19.18.tar.gz) = e3c58cc6c38b277b3b9fd7adf33df91b47e0385e59d52c543e630a194d73d04d91e0a3845cb3973d1955f77049e75246fa7e6f544e02e1efe0086a297cf1d887 From 47b525caad748fa404eda0ce1bc9d722fef84fde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 16 Aug 2019 00:33:43 +0200 Subject: [PATCH 22/73] Rebuilt for Python 3.8 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index c7f551b..a525dac 100644 --- a/sip.spec +++ b/sip.spec @@ -24,7 +24,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.18 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -324,6 +324,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Thu Aug 15 2019 Miro Hrončok - 4.19.18-2 +- Rebuilt for Python 3.8 + * Sun Aug 04 2019 Rex Dieter - 4.19.18-1 - 4.19.18 From 74792297b361dc2e47621ce724fc4486344ce58f Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 14:37:32 -0500 Subject: [PATCH 23/73] Path fixes for flatpak. --- sip.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index a525dac..96d991f 100644 --- a/sip.spec +++ b/sip.spec @@ -24,7 +24,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.18 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -162,6 +162,7 @@ This is the Python 3 build of pyqt5-SIP. mkdir %{_target_platform}-python2 pushd %{_target_platform}-python2 %{__python2} ../configure.py \ + -b %{_bindir} -d %{python2_sitearch} -e %{_includedir}/python%{python2_version} \ CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -172,6 +173,7 @@ mkdir %{_target_platform}-python2-pyqt4 pushd %{_target_platform}-python2-pyqt4 %{__python2} ../configure.py \ --sip-module=PyQt4.sip \ + -b %{_bindir} -d %{python2_sitearch} -e %{_includedir}/python%{python2_version} \ CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -181,6 +183,7 @@ mkdir %{_target_platform}-python2-pyqt5 pushd %{_target_platform}-python2-pyqt5 %{__python2} ../configure.py \ --sip-module=PyQt5.sip \ + -b %{_bindir} -d %{python2_sitearch} -e %{_includedir}/python%{python2_version} \ CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -191,6 +194,7 @@ popd mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 %{__python3} ../configure.py \ + -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -201,6 +205,7 @@ mkdir %{_target_platform}-python3-pyqt4 pushd %{_target_platform}-python3-pyqt4 %{__python3} ../configure.py \ --sip-module=PyQt4.sip \ + -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -210,6 +215,7 @@ mkdir %{_target_platform}-python3-pyqt5 pushd %{_target_platform}-python3-pyqt5 %{__python3} ../configure.py \ --sip-module=PyQt5.sip \ + -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -324,6 +330,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Mon Aug 19 2019 Gwyn Ciesla - 4.19.18-3 +- Set paths for flatpak. + * Thu Aug 15 2019 Miro Hrončok - 4.19.18-2 - Rebuilt for Python 3.8 From c168cce08e62e9bc774c0eec4fba232a47212bc2 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 14:56:04 -0500 Subject: [PATCH 24/73] include macros. --- sip.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sip.spec b/sip.spec index 96d991f..96e9d1c 100644 --- a/sip.spec +++ b/sip.spec @@ -272,7 +272,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{rpm_macros_dir}/macros.sip %files -n python2-sip-devel -%{python2_inc}/sip.h +%{_prefix}/include/python2.7/sip.h %{python2_sitearch}/sipconfig.py* %{python2_sitearch}/sipdistutils.py* @@ -299,7 +299,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel -%{python3_inc}/sip.h +%{_prefix}/include/python%{python3_version}/sip.h %{python3_sitearch}/sipconfig.py* %{python3_sitearch}/sipdistutils.py* %{python3_sitearch}/__pycache__/* From 6855bded9df2fe3d4ddc98bfdd20c96146943393 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 19 Aug 2019 15:14:55 -0500 Subject: [PATCH 25/73] Dropped an m. --- sip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 96e9d1c..c399f87 100644 --- a/sip.spec +++ b/sip.spec @@ -299,7 +299,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel -%{_prefix}/include/python%{python3_version}/sip.h +%{_prefix}/include/python%{python3_version}m/sip.h %{python3_sitearch}/sipconfig.py* %{python3_sitearch}/sipdistutils.py* %{python3_sitearch}/__pycache__/* From d6e206c17d79b49ccab86caed0fe5ebb7129bbd9 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 27 Aug 2019 08:31:45 -0500 Subject: [PATCH 26/73] Revert "Dropped an m." This reverts commit 6855bded9df2fe3d4ddc98bfdd20c96146943393. --- sip.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index c399f87..96e9d1c 100644 --- a/sip.spec +++ b/sip.spec @@ -299,7 +299,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel -%{_prefix}/include/python%{python3_version}m/sip.h +%{_prefix}/include/python%{python3_version}/sip.h %{python3_sitearch}/sipconfig.py* %{python3_sitearch}/sipdistutils.py* %{python3_sitearch}/__pycache__/* From b01a723e420103ee0d485df3193c370219b0ee5e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 27 Aug 2019 08:58:44 -0500 Subject: [PATCH 27/73] Drop m. --- sip.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sip.spec b/sip.spec index 96e9d1c..439b7b9 100644 --- a/sip.spec +++ b/sip.spec @@ -194,7 +194,7 @@ popd mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 %{__python3} ../configure.py \ - -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \ + -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -205,7 +205,7 @@ mkdir %{_target_platform}-python3-pyqt4 pushd %{_target_platform}-python3-pyqt4 %{__python3} ../configure.py \ --sip-module=PyQt4.sip \ - -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \ + -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -215,7 +215,7 @@ mkdir %{_target_platform}-python3-pyqt5 pushd %{_target_platform}-python3-pyqt5 %{__python3} ../configure.py \ --sip-module=PyQt5.sip \ - -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version}m \ + -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build From 13805b5303dac5f6ab1f44d7f81272836a00a707 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 27 Aug 2019 22:04:01 -0400 Subject: [PATCH 28/73] Build a namespaced sip module, wx.siplib, for wxpython (#1739469) --- sip-4.19.18-no_hardcode_sip_so.patch | 12 +++++ sip.spec | 68 +++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 sip-4.19.18-no_hardcode_sip_so.patch diff --git a/sip-4.19.18-no_hardcode_sip_so.patch b/sip-4.19.18-no_hardcode_sip_so.patch new file mode 100644 index 0000000..b6fe637 --- /dev/null +++ b/sip-4.19.18-no_hardcode_sip_so.patch @@ -0,0 +1,12 @@ +diff -up sip-4.19.18/configure.py.orig sip-4.19.18/configure.py +--- sip-4.19.18/configure.py.orig 2019-07-04 12:28:08.000000000 -0400 ++++ sip-4.19.18/configure.py 2019-08-27 21:56:33.871428348 -0400 +@@ -447,7 +447,7 @@ def create_makefiles(macros): + if sys.platform == 'win32': + mod = 'sip.lib' if opts.static else 'sip.pyd' + else: +- mod = 'libsip.a' if opts.static else 'sip.so' ++ mod = 'libsip.a' if opts.static else sip_module_name.split('.')[-1] + '.so' + + all_installs.append((mod, sip_module_dest_dir)) + diff --git a/sip.spec b/sip.spec index 439b7b9..3bbd051 100644 --- a/sip.spec +++ b/sip.spec @@ -24,7 +24,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.18 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -43,6 +43,8 @@ Patch51: sip-4.18-no_rpath.patch # set sip_bin properly for python3 build (needswork to be upstreamable) # no longer needed? keep for a little while before dropping completely -- rex #Patch52: sip-4.19.3-python3_sip_bin.patch +# Avoid hardcoding sip.so (needed for wxpython's siplib.so) +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 @@ -107,6 +109,13 @@ Provides: python2-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-pyqt5-sip} %description -n python2-pyqt5-sip %_description +%package -n python2-wx-siplib +Summary: %summary +Provides: python2-wx-siplib-api(%{_sip_api_major}) = %{_sip_api} +Provides: python2-wx-siplib-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%{?python_provide:%python_provide python2-wx-siplib} +%description -n python2-wx-siplib %_description + %if %{with python3} %if 0%{?no_namespace} %package -n python%{python3_pkgversion}-sip @@ -144,6 +153,14 @@ Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %description -n python%{python3_pkgversion}-pyqt5-sip This is the Python 3 build of pyqt5-SIP. +%package -n python%{python3_pkgversion}-wx-siplib +Summary: SIP - Python 3/C++ Bindings Generator for wx +BuildRequires: python%{python3_pkgversion}-devel +Provides: python%{python3_pkgversion}-wx-siplib-api(%{_sip_api_major}) = %{_sip_api} +Provides: python%{python3_pkgversion}-wx-siplib-api(%{_sip_api_major})%{?_isa} = %{_sip_api} +%description -n python%{python3_pkgversion}-wx-siplib +This is the Python 3 build of wx-siplib. + %_description %endif @@ -155,6 +172,7 @@ This is the Python 3 build of pyqt5-SIP. %patch50 -p1 -b .no_strip %patch51 -p1 -b .no_rpath +%patch53 -p1 -b .no_sip_so %build @@ -189,6 +207,18 @@ pushd %{_target_platform}-python2-pyqt5 %make_build popd +sed -i -e 's|target = sip|target = siplib|g' siplib/siplib.sbf +mkdir %{_target_platform}-python2-wx +pushd %{_target_platform}-python2-wx +%{__python2} ../configure.py \ + --sip-module=wx.siplib \ + -b %{_bindir} -d %{python2_sitearch} -e %{_includedir}/python%{python2_version} \ + CFLAGS+="%{optflags}" CXXFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" + +%make_build +popd +sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf + %if %{with python3} %if 0%{?no_namespace} mkdir %{_target_platform}-python3 @@ -221,6 +251,18 @@ pushd %{_target_platform}-python3-pyqt5 %make_build popd +sed -i -e 's|target = sip|target = siplib|g' siplib/siplib.sbf +mkdir %{_target_platform}-python3-wx +pushd %{_target_platform}-python3-wx +%{__python3} ../configure.py \ + --sip-module=wx.siplib \ + -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ + CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" + +%make_build +popd +sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf + %endif @@ -233,6 +275,8 @@ popd %endif %make_install -C %{_target_platform}-python3-pyqt4 %make_install -C %{_target_platform}-python3-pyqt5 +%make_install -C %{_target_platform}-python3-wx +mv %{buildroot}%{python3_sitearch}/wx/sip.pyi %{buildroot}%{python3_sitearch}/wx/siplib.pyi ln -s sip %{buildroot}%{_bindir}/python3-sip ## toplevel __pycache__ creation is ... inconsistent @@ -246,12 +290,16 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %endif %make_install -C %{_target_platform}-python2-pyqt4 %make_install -C %{_target_platform}-python2-pyqt5 +%make_install -C %{_target_platform}-python2-wx +mv %{buildroot}%{python2_sitearch}/wx/sip.pyi %{buildroot}%{python2_sitearch}/wx/siplib.pyi # sip-wrapper install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt4 install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt5 +install %{SOURCE10} %{buildroot}%{_bindir}/sip-wx sed -i -e 's|@SIP_MODULE@|PyQt4.sip|g' %{buildroot}%{_bindir}/sip-pyqt4 sed -i -e 's|@SIP_MODULE@|PyQt5.sip|g' %{buildroot}%{_bindir}/sip-pyqt5 +sed -i -e 's|@SIP_MODULE@|wx.siplib|g' %{buildroot}%{_bindir}/sip-wx mkdir -p %{buildroot}%{_datadir}/sip @@ -266,6 +314,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip # sip-wrappers %{_bindir}/sip-pyqt4 %{_bindir}/sip-pyqt5 +%{_bindir}/sip-wx # compat symlink %{_bindir}/python3-sip %dir %{_datadir}/sip/ @@ -297,6 +346,13 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{python2_sitearch}/PyQt5/sip.* %{python2_sitearch}/PyQt5_sip-%{version}.dist-info/ +%files -n python2-wx-siplib +%doc NEWS README +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%dir %{python2_sitearch}/wx/ +%{python2_sitearch}/wx/siplib.* +%{python2_sitearch}/wx_siplib-%{version}.dist-info/ + %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel %{_prefix}/include/python%{python3_version}/sip.h @@ -326,10 +382,20 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %dir %{python3_sitearch}/PyQt5/ %{python3_sitearch}/PyQt5/sip.* %{python3_sitearch}/PyQt5_sip-%{version}.dist-info/ + +%files -n python%{python3_pkgversion}-wx-siplib +%doc NEWS README +%license LICENSE LICENSE-GPL2 LICENSE-GPL3 +%dir %{python3_sitearch}/wx/ +%{python3_sitearch}/wx/siplib.* +%{python3_sitearch}/wx_siplib-%{version}.dist-info/ %endif %changelog +* Mon Aug 19 2019 Scott Talbert - 4.19.18-4 +- Build a namespaced sip module, wx.siplib, for wxpython (#1739469) + * Mon Aug 19 2019 Gwyn Ciesla - 4.19.18-3 - Set paths for flatpak. From ab0dc0f34da450123a850e2c5316caa15760b6ea Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 29 Aug 2019 08:40:19 -0500 Subject: [PATCH 29/73] Conditionalize python 3 includes. --- sip.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/sip.spec b/sip.spec index 3bbd051..4872ce0 100644 --- a/sip.spec +++ b/sip.spec @@ -7,6 +7,13 @@ %{!?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 + %global PYINCLUDE %{_includedir}/python%{python3_version} +%endif +%if %{fedora} <= 30 + %global PYINCLUDE %{_includedir}/python%{python3_version}m +%endif + %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) # trim changelog included in binary rpms @@ -24,7 +31,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.18 -Release: 4%{?dist} +Release: 5%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -224,7 +231,7 @@ sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf mkdir %{_target_platform}-python3 pushd %{_target_platform}-python3 %{__python3} ../configure.py \ - -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ + -b %{_bindir} -d %{python3_sitearch} -e %{PYINCLUDE} \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -235,7 +242,7 @@ mkdir %{_target_platform}-python3-pyqt4 pushd %{_target_platform}-python3-pyqt4 %{__python3} ../configure.py \ --sip-module=PyQt4.sip \ - -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ + -b %{_bindir} -d %{python3_sitearch} -e %{PYINCLUDE} \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -245,7 +252,7 @@ mkdir %{_target_platform}-python3-pyqt5 pushd %{_target_platform}-python3-pyqt5 %{__python3} ../configure.py \ --sip-module=PyQt5.sip \ - -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ + -b %{_bindir} -d %{python3_sitearch} -e %{PYINCLUDE} \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -256,7 +263,7 @@ mkdir %{_target_platform}-python3-wx pushd %{_target_platform}-python3-wx %{__python3} ../configure.py \ --sip-module=wx.siplib \ - -b %{_bindir} -d %{python3_sitearch} -e %{_includedir}/python%{python3_version} \ + -b %{_bindir} -d %{python3_sitearch} -e %{PYINCLUDE} \ CXXFLAGS+="%{optflags}" CFLAGS+="%{optflags}" LFLAGS+="%{?__global_ldflags}" %make_build @@ -355,7 +362,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel -%{_prefix}/include/python%{python3_version}/sip.h +%{PYINCLUDE}/sip.h %{python3_sitearch}/sipconfig.py* %{python3_sitearch}/sipdistutils.py* %{python3_sitearch}/__pycache__/* @@ -393,6 +400,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Wed Aug 28 2019 Gwyn Ciesla 4.19.18-5 +- Conditionalize Python 3 include dir. + * Mon Aug 19 2019 Scott Talbert - 4.19.18-4 - Build a namespaced sip module, wx.siplib, for wxpython (#1739469) From 50ea82423b9de33aa10619c5d1c15de817636466 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Thu, 5 Sep 2019 20:39:33 -0400 Subject: [PATCH 30/73] Simplify PYINCLUDE conditional and fix for F31 --- sip.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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. From f7175e4e20301e63d2bc8ac7bfa677c3a6eed4f6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 16 Sep 2019 09:04:56 -0500 Subject: [PATCH 31/73] drop no_namespace variant for f31+ --- sip.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sip.spec b/sip.spec index 0ead999..7a0e0fe 100644 --- a/sip.spec +++ b/sip.spec @@ -24,13 +24,15 @@ #global snap dev1807041651 # provide non-namespace python modules -# needed by at least some non-qt consumers, e.g. wxpython4 +# needed by at least some legacy/non-qt consumers, e.g. pykde4 +%if 0%{?fedora} < 31 %global no_namespace 1 +%endif Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.18 -Release: 6%{?dist} +Release: 7%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -399,6 +401,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Mon Sep 16 2019 Rex Dieter - 4.19.18-7 +- drop no_namespace variant for f31+ + * Fri Sep 06 2019 Scott Talbert - 4.19.18-6 - Simplify PYINCLUDE conditional and fix for F31 From 8fd958b1a4ffa6e6bd539032eba9eaeb6b70dc9e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 25 Sep 2019 13:58:48 -0500 Subject: [PATCH 32/73] 4.19.19, sip-api(12)=12.7 Obsoletes: python2-sip python3-sip (when omitted for f31+) --- .gitignore | 1 + macros.sip | 2 +- sip.spec | 18 +++++++++++++----- sources | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) 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 From abd8828da9a19410be0add4adb26cf188008e6c4 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 31 Oct 2019 15:21:44 +0100 Subject: [PATCH 33/73] Add virtual provides when no namespace --- sip.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sip.spec b/sip.spec index 314e0a0..74cc4cc 100644 --- a/sip.spec +++ b/sip.spec @@ -67,7 +67,9 @@ Provides: sip-macros = %{version}-%{release} # upgrade path when no_namespace variants are dropped %if ! 0%{?no_namespace} Obsoletes: python2-sip < %{version}-%{release} +Provides: python2-sip = %{version}-%{release} Obsoletes: python3-sip < %{version}-%{release} +Provides: python3-sip = %{version}-%{release} %endif %global _description\ From 49b6fedc3f50b09379840b62440b67224bab08f3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 31 Oct 2019 15:23:37 +0100 Subject: [PATCH 34/73] Update changelog --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 74cc4cc..9d97dc0 100644 --- a/sip.spec +++ b/sip.spec @@ -30,7 +30,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.19 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -407,6 +407,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Thu Oct 31 2019 Nicolas Chauvet - 4.19.19-2 +- Add virtual provides python{2,3}-sip + * 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+) From 1eb3bcf67ab7e6f17f0fbb53c1ae3a9923dec213 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 3 Nov 2019 18:01:42 -0600 Subject: [PATCH 35/73] revert virtual provides (bad idea) Bad idea because anything depending on those will not work, better to highlight that fact so we know what needs fixing. --- sip.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sip.spec b/sip.spec index 9d97dc0..6e158a1 100644 --- a/sip.spec +++ b/sip.spec @@ -30,7 +30,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.19 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -67,9 +67,7 @@ Provides: sip-macros = %{version}-%{release} # upgrade path when no_namespace variants are dropped %if ! 0%{?no_namespace} Obsoletes: python2-sip < %{version}-%{release} -Provides: python2-sip = %{version}-%{release} Obsoletes: python3-sip < %{version}-%{release} -Provides: python3-sip = %{version}-%{release} %endif %global _description\ @@ -407,6 +405,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sun Nov 03 2019 Rex Dieter - 4.19.19-3 +- revert virtual provides (bad idea) + * Thu Oct 31 2019 Nicolas Chauvet - 4.19.19-2 - Add virtual provides python{2,3}-sip From 54aa2c6288779a1f462c947c0d87703cd135669f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 15 Nov 2019 16:06:32 -0600 Subject: [PATCH 36/73] disable python2 support on f32+ (#1752802) --- sip.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 6e158a1..4b38cd5 100644 --- a/sip.spec +++ b/sip.spec @@ -1,4 +1,7 @@ %bcond_without python3 +%if 0%{?fedora} < 32 +%bcond_without python2 +%endif %if %{with python3} %{!?python3_inc:%global python3_inc %(%{__python3} -c "from distutils.sysconfig import get_python_inc; print(get_python_inc(1))")} @@ -30,7 +33,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.19 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -83,6 +86,7 @@ class library. %description %_description +%if %{with python2} %if 0%{?no_namespace} %package -n python2-sip Summary: %summary @@ -127,6 +131,7 @@ Provides: python2-wx-siplib-api(%{_sip_api_major}) = %{_sip_api} Provides: python2-wx-siplib-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %{?python_provide:%python_provide python2-wx-siplib} %description -n python2-wx-siplib %_description +%endif %if %{with python3} %if 0%{?no_namespace} @@ -188,6 +193,7 @@ This is the Python 3 build of wx-siplib. %build +%if %{with python2} %if 0%{?no_namespace} mkdir %{_target_platform}-python2 pushd %{_target_platform}-python2 @@ -229,6 +235,7 @@ pushd %{_target_platform}-python2-wx %make_build popd +%endif sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf %if %{with python3} @@ -297,6 +304,7 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %endif # Python 2 installation: +%if %{with python2} %if 0%{?no_namespace} %make_install -C %{_target_platform}-python2 %endif @@ -304,6 +312,7 @@ mkdir -p %{buildroot}%{python3_sitearch}/__pycache__/exclude_rpm_hack %make_install -C %{_target_platform}-python2-pyqt5 %make_install -C %{_target_platform}-python2-wx mv %{buildroot}%{python2_sitearch}/wx/sip.pyi %{buildroot}%{python2_sitearch}/wx/siplib.pyi +%endif # sip-wrapper install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt4 @@ -332,6 +341,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %dir %{_datadir}/sip/ %{rpm_macros_dir}/macros.sip +%if %{with python2} %files -n python2-sip-devel %{_prefix}/include/python2.7/sip.h %{python2_sitearch}/sipconfig.py* @@ -364,6 +374,7 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %dir %{python2_sitearch}/wx/ %{python2_sitearch}/wx/siplib.* %{python2_sitearch}/wx_siplib-%{version}.dist-info/ +%endif %if %{with python3} %files -n python%{python3_pkgversion}-sip-devel @@ -405,6 +416,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Fri Nov 15 2019 Rex Dieter - 4.19.19-4 +- disable python2 support on f32+ (#1752802) + * Sun Nov 03 2019 Rex Dieter - 4.19.19-3 - revert virtual provides (bad idea) From 5943a42c702ea53595c1e3db1af735e0845a6f4a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 20 Dec 2019 10:04:02 -0600 Subject: [PATCH 37/73] 4.19.20, adjust whitespace --- .gitignore | 1 + sip.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1283264..ede79a2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /sip-4.19.17.tar.gz /sip-4.19.18.tar.gz /sip-4.19.19.tar.gz +/sip-4.19.20.tar.gz diff --git a/sip.spec b/sip.spec index 4b38cd5..8bcab1d 100644 --- a/sip.spec +++ b/sip.spec @@ -11,9 +11,9 @@ %{!?python2_inc:%global python2_inc %(%{__python2} -c "from distutils.sysconfig import get_python_inc; print get_python_inc(1)")} %if %{fedora} > 31 - %global PYINCLUDE %{_includedir}/python%{python3_version} +%global PYINCLUDE %{_includedir}/python%{python3_version} %else - %global PYINCLUDE %{_includedir}/python%{python3_version}m +%global PYINCLUDE %{_includedir}/python%{python3_version}m %endif %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) @@ -32,8 +32,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.19 -Release: 4%{?dist} +Version: 4.19.20 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -416,6 +416,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Fri Dec 20 2019 Rex Dieter - 4.19.20-1 +- 4.19.20, adjust whitespace + * Fri Nov 15 2019 Rex Dieter - 4.19.19-4 - disable python2 support on f32+ (#1752802) diff --git a/sources b/sources index 88025cf..5682e27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.19.tar.gz) = 396c625f59ccef67c2e94221b26dd4ed5d536652a9b63a9f23b340ddf16adf34c6bdb0fbd7c0c1cc403e1d59e8ebf716b478a24bade66a2703fcc5f00b62533d +SHA512 (sip-4.19.20.tar.gz) = d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44 From 860ebc410c7af1c09ffea6307d347f8933ae1487 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 23:34:28 +0000 Subject: [PATCH 38/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 8bcab1d..a044e14 100644 --- a/sip.spec +++ b/sip.spec @@ -33,7 +33,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.20 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -416,6 +416,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 4.19.20-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Dec 20 2019 Rex Dieter - 4.19.20-1 - 4.19.20, adjust whitespace From f5b657d749a04199ca0657e63d5a1f0edf08d07a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 31 Jan 2020 13:54:18 -0600 Subject: [PATCH 39/73] 4.19.21 --- .gitignore | 1 + sip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ede79a2..f37b383 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /sip-4.19.18.tar.gz /sip-4.19.19.tar.gz /sip-4.19.20.tar.gz +/sip-4.19.21.tar.gz diff --git a/sip.spec b/sip.spec index a044e14..41a8f36 100644 --- a/sip.spec +++ b/sip.spec @@ -32,8 +32,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.20 -Release: 2%{?dist} +Version: 4.19.21 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -416,6 +416,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Fri Jan 31 2020 Rex Dieter - 4.19.21-1 +- 4.19.21 + * Thu Jan 30 2020 Fedora Release Engineering - 4.19.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 5682e27..5d4cf79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.20.tar.gz) = d5cd49f6fcae08306ac5f993710c40b82804d6b268cf3fa14077e73f34b02d551aa3caf57a985fe39b5acd61c465b00372d2ada722ced76e670dec14b5f8de44 +SHA512 (sip-4.19.21.tar.gz) = 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60 From 774146ea69d80acdb34abf1ec1714969d6bc4302 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 4 Apr 2020 14:28:29 -0500 Subject: [PATCH 40/73] 4.19.22 --- .gitignore | 1 + sip.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f37b383..3213589 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /sip-4.19.19.tar.gz /sip-4.19.20.tar.gz /sip-4.19.21.tar.gz +/sip-4.19.22.tar.gz diff --git a/sip.spec b/sip.spec index 41a8f36..6172cf9 100644 --- a/sip.spec +++ b/sip.spec @@ -32,7 +32,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.21 +Version: 4.19.22 Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) @@ -416,6 +416,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %changelog +* Sat Apr 04 2020 Rex Dieter - 4.19.22-1 +- 4.19.22 + * Fri Jan 31 2020 Rex Dieter - 4.19.21-1 - 4.19.21 diff --git a/sources b/sources index 5d4cf79..3092d53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.21.tar.gz) = 441e1fe6b3eb6820638f9b4436e820da39b72dd70b402afa5237979ac671978c081d92e1e78920bb754bbc66b159bad08edb3bbb497b7e72dee6ff1d69cd1b60 +SHA512 (sip-4.19.22.tar.gz) = 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5 From 1b926dea3d7f8ef8891557d23b5df2cc2e19883c Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Mon, 20 Apr 2020 02:03:54 -0400 Subject: [PATCH 41/73] Add doc subpackage --- sip.spec | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/sip.spec b/sip.spec index 6172cf9..98f8d3b 100644 --- a/sip.spec +++ b/sip.spec @@ -33,12 +33,12 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.22 -Release: 1%{?dist} +Release: 2%{?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 -Source0: https://www.riverbankcomputing.com/static/Downloads/sip/%{version}/sip-%{version}%{?snap:.%{snap}}.tar.gz +Url: https://riverbankcomputing.com/software/sip/intro +Source0: https://riverbankcomputing.com/static/Downloads/sip/%{version}/sip-%{version}%{?snap:.%{snap}}.tar.gz Source10: sip-wrapper.sh @@ -86,6 +86,13 @@ class library. %description %_description +%package doc +Summary: Documentation for %summary +BuildArch: noarch +%description doc +This package contains HTML documentation for SIP. +%_description + %if %{with python2} %if 0%{?no_namespace} %package -n python2-sip @@ -327,6 +334,11 @@ mkdir -p %{buildroot}%{_datadir}/sip # Macros used by -devel subpackages: install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip +# Copy documentation from source dir +pushd doc +find html/ -type f -exec install -m0644 -D {} %{buildroot}%{_pkgdocdir}/{} \; +popd + %files %doc README @@ -341,6 +353,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %dir %{_datadir}/sip/ %{rpm_macros_dir}/macros.sip +%files doc +%{_pkgdocdir}/html + %if %{with python2} %files -n python2-sip-devel %{_prefix}/include/python2.7/sip.h @@ -414,8 +429,10 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{rpm_macros_dir}/macros.sip %{python3_sitearch}/wx_siplib-%{version}.dist-info/ %endif - %changelog +* Mon Apr 20 2020 FeRD (Frank Dana) - 4.19.22-2 +- Add documentation subpackage + * Sat Apr 04 2020 Rex Dieter - 4.19.22-1 - 4.19.22 From 511fc72f86d43feb9fd57b069da35477e3a3bd2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 23 May 2020 11:04:19 +0200 Subject: [PATCH 42/73] Rebuilt for Python 3.9 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 98f8d3b..fe0af91 100644 --- a/sip.spec +++ b/sip.spec @@ -33,7 +33,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.22 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -430,6 +430,9 @@ popd %endif %changelog +* Sat May 23 2020 Miro Hrončok - 4.19.22-3 +- Rebuilt for Python 3.9 + * Mon Apr 20 2020 FeRD (Frank Dana) - 4.19.22-2 - Add documentation subpackage From 57cd99d55a87452ee2bf0a108701da47f7f41269 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Jun 2020 09:25:58 -0500 Subject: [PATCH 43/73] 4.19.23 --- .gitignore | 1 + sip.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 3213589..ef6640c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /sip-4.19.20.tar.gz /sip-4.19.21.tar.gz /sip-4.19.22.tar.gz +/sip-4.19.23.tar.gz diff --git a/sip.spec b/sip.spec index fe0af91..b8887e3 100644 --- a/sip.spec +++ b/sip.spec @@ -32,8 +32,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.22 -Release: 3%{?dist} +Version: 4.19.23 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -429,7 +429,11 @@ popd %{python3_sitearch}/wx_siplib-%{version}.dist-info/ %endif + %changelog +* Mon Jun 08 2020 Rex Dieter - 4.19.23-1 +- 4.19.23 + * Sat May 23 2020 Miro Hrončok - 4.19.22-3 - Rebuilt for Python 3.9 diff --git a/sources b/sources index 3092d53..f3f0695 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.22.tar.gz) = 4d366e589945e589f69a3caf979076ef37e319ac0efdd8ec3cee4869da89e112832462215ca2e235036bacfade7efc4d530aa93e7492c283dc1b2503e08feea5 +SHA512 (sip-4.19.23.tar.gz) = a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1 From bfb3f476c4e3d05fcfe0bc1f7e194318be0092cd Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 20 Jul 2020 15:47:48 -0500 Subject: [PATCH 44/73] Minor conditional fixes for ELN Signed-off-by: Merlin Mathesius --- sip.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sip.spec b/sip.spec index b8887e3..ef9355d 100644 --- a/sip.spec +++ b/sip.spec @@ -1,5 +1,5 @@ %bcond_without python3 -%if 0%{?fedora} < 32 +%if (0%{?fedora} && 0%{?fedora} < 32) || (0%{?rhel} && 0%{?rhel} < 9) %bcond_without python2 %endif @@ -10,7 +10,7 @@ %{!?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} > 31 +%if 0%{?fedora} > 31 || 0%{?rhel} > 8 %global PYINCLUDE %{_includedir}/python%{python3_version} %else %global PYINCLUDE %{_includedir}/python%{python3_version}m @@ -26,7 +26,7 @@ # provide non-namespace python modules # needed by at least some legacy/non-qt consumers, e.g. pykde4 -%if 0%{?fedora} < 31 +%if 0%{?fedora} && 0%{?fedora} < 31 %global no_namespace 1 %endif @@ -431,6 +431,9 @@ popd %changelog +* Mon Jul 20 2020 Merlin Mathesius - 4.19.23-1 +- Minor conditional fixes for ELN + * Mon Jun 08 2020 Rex Dieter - 4.19.23-1 - 4.19.23 From bb87f41a4a32b9a2745de6ce287bcad7291ee2e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 10:51:22 +0000 Subject: [PATCH 45/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index ef9355d..169b84f 100644 --- a/sip.spec +++ b/sip.spec @@ -33,7 +33,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.23 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -431,6 +431,9 @@ popd %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.19.23-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 20 2020 Merlin Mathesius - 4.19.23-1 - Minor conditional fixes for ELN From 2c315db360735b3df2cbe3fdede369c4a6a9441c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 17 Aug 2020 15:32:06 -0500 Subject: [PATCH 46/73] 4.19.24 --- .gitignore | 1 + sip.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ef6640c..f7b1e4a 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /sip-4.19.21.tar.gz /sip-4.19.22.tar.gz /sip-4.19.23.tar.gz +/sip-4.19.24.tar.gz diff --git a/sip.spec b/sip.spec index 169b84f..5194e6b 100644 --- a/sip.spec +++ b/sip.spec @@ -32,8 +32,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.23 -Release: 2%{?dist} +Version: 4.19.24 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -431,6 +431,9 @@ popd %changelog +* Mon Aug 17 2020 Rex Dieter - 4.19.24-1 +- 4.19.24 + * Wed Jul 29 2020 Fedora Release Engineering - 4.19.23-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index f3f0695..f458ce7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.23.tar.gz) = a50c6202ebb6a5d1c98b6fc79925fa5d82236a944003854b057be9e2f7340d5cd689ba0e08f46f521736f3574c4089768c869bb8921e66b23944a31a832770f1 +SHA512 (sip-4.19.24.tar.gz) = c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0 From 65ccdbf611f15154fc467970ffec41fa86cab1b7 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 8 Jan 2021 21:32:45 +0000 Subject: [PATCH 47/73] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- sip.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/sip.spec b/sip.spec index 5194e6b..4572913 100644 --- a/sip.spec +++ b/sip.spec @@ -61,6 +61,7 @@ Source1: macros.sip %global _sip_api_minor 7 %global _sip_api %{_sip_api_major}.%{_sip_api_minor} +BuildRequires: make BuildRequires: gcc-c++ BuildRequires: sed From 4735f6efad39d8939dadc44a0523061a36537460 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Sun, 17 Jan 2021 12:59:18 -0500 Subject: [PATCH 48/73] Stop building wx.siplib on F34+ as wx has switched to sip 5 --- sip.spec | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 4572913..09c31da 100644 --- a/sip.spec +++ b/sip.spec @@ -30,10 +30,17 @@ %global no_namespace 1 %endif +# Stop building siplib for wx on F34+ +%if 0%{?fedora} && 0%{?fedora} >= 34 +%global wx_siplib 0 +%else +%global wx_siplib 1 +%endif + Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -178,6 +185,7 @@ Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %description -n python%{python3_pkgversion}-pyqt5-sip This is the Python 3 build of pyqt5-SIP. +%if %{?wx_siplib} %package -n python%{python3_pkgversion}-wx-siplib Summary: SIP - Python 3/C++ Bindings Generator for wx BuildRequires: python%{python3_pkgversion}-devel @@ -185,6 +193,7 @@ Provides: python%{python3_pkgversion}-wx-siplib-api(%{_sip_api_major}) = %{_sip_ Provides: python%{python3_pkgversion}-wx-siplib-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python%{python3_pkgversion}-wx-siplib This is the Python 3 build of wx-siplib. +%endif %_description @@ -278,6 +287,7 @@ pushd %{_target_platform}-python3-pyqt5 %make_build popd +%if %{?wx_siplib} sed -i -e 's|target = sip|target = siplib|g' siplib/siplib.sbf mkdir %{_target_platform}-python3-wx pushd %{_target_platform}-python3-wx @@ -289,6 +299,7 @@ pushd %{_target_platform}-python3-wx %make_build popd sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf +%endif %endif @@ -302,8 +313,10 @@ sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf %endif %make_install -C %{_target_platform}-python3-pyqt4 %make_install -C %{_target_platform}-python3-pyqt5 +%if %{?wx_siplib} %make_install -C %{_target_platform}-python3-wx mv %{buildroot}%{python3_sitearch}/wx/sip.pyi %{buildroot}%{python3_sitearch}/wx/siplib.pyi +%endif ln -s sip %{buildroot}%{_bindir}/python3-sip ## toplevel __pycache__ creation is ... inconsistent @@ -325,10 +338,14 @@ mv %{buildroot}%{python2_sitearch}/wx/sip.pyi %{buildroot}%{python2_sitearch}/wx # sip-wrapper install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt4 install %{SOURCE10} %{buildroot}%{_bindir}/sip-pyqt5 +%if %{?wx_siplib} install %{SOURCE10} %{buildroot}%{_bindir}/sip-wx +%endif sed -i -e 's|@SIP_MODULE@|PyQt4.sip|g' %{buildroot}%{_bindir}/sip-pyqt4 sed -i -e 's|@SIP_MODULE@|PyQt5.sip|g' %{buildroot}%{_bindir}/sip-pyqt5 +%if %{?wx_siplib} sed -i -e 's|@SIP_MODULE@|wx.siplib|g' %{buildroot}%{_bindir}/sip-wx +%endif mkdir -p %{buildroot}%{_datadir}/sip @@ -348,7 +365,9 @@ popd # sip-wrappers %{_bindir}/sip-pyqt4 %{_bindir}/sip-pyqt5 +%if %{?wx_siplib} %{_bindir}/sip-wx +%endif # compat symlink %{_bindir}/python3-sip %dir %{_datadir}/sip/ @@ -422,6 +441,7 @@ popd %{python3_sitearch}/PyQt5/sip.* %{python3_sitearch}/PyQt5_sip-%{version}.dist-info/ +%if %{?wx_siplib} %files -n python%{python3_pkgversion}-wx-siplib %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 @@ -429,9 +449,13 @@ popd %{python3_sitearch}/wx/siplib.* %{python3_sitearch}/wx_siplib-%{version}.dist-info/ %endif +%endif %changelog +* Sun Jan 17 2021 Scott Talbert - 4.19.24-2 +- Stop building wx.siplib on F34+ as wx has switched to sip 5 + * Mon Aug 17 2020 Rex Dieter - 4.19.24-1 - 4.19.24 From cd29bc8f7584d569cb62250096a9a9852d640a8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 20:30:19 +0000 Subject: [PATCH 49/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 09c31da..f04eee0 100644 --- a/sip.spec +++ b/sip.spec @@ -40,7 +40,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -453,6 +453,9 @@ popd %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 4.19.24-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Jan 17 2021 Scott Talbert - 4.19.24-2 - Stop building wx.siplib on F34+ as wx has switched to sip 5 From 2b020f6244c537be617aee7a3be2fc4752d6fa99 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Thu, 3 Jun 2021 15:14:27 +0200 Subject: [PATCH 50/73] Rebuilt for Python 3.10 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index f04eee0..0244cac 100644 --- a/sip.spec +++ b/sip.spec @@ -40,7 +40,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -453,6 +453,9 @@ popd %changelog +* Thu Jun 03 2021 Python Maint - 4.19.24-4 +- Rebuilt for Python 3.10 + * Wed Jan 27 2021 Fedora Release Engineering - 4.19.24-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dbfd3563ab114087fc6fd23ea40a4c048cb6cc9b Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Wed, 16 Jun 2021 23:04:45 -0400 Subject: [PATCH 51/73] Stop building python3-pyqt5-sip package on F35+ - replaced by separate pkg --- sip.spec | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 0244cac..23779a7 100644 --- a/sip.spec +++ b/sip.spec @@ -37,10 +37,17 @@ %global wx_siplib 1 %endif +# Stop building PyQt5.sip on F35+ +%if 0%{?fedora} && 0%{?fedora} >= 35 +%global pyqt5_sip 0 +%else +%global pyqt5_sip 1 +%endif + Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 4%{?dist} +Release: 5%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -177,6 +184,7 @@ Provides: python%{python3_pkgversion}-pyqt4-sip-api(%{_sip_api_major})%{?_isa} = %description -n python%{python3_pkgversion}-pyqt4-sip This is the Python 3 build of pyqt4-SIP. +%if %{?pyqt5_sip} %package -n python%{python3_pkgversion}-pyqt5-sip Summary: SIP - Python 3/C++ Bindings Generator for pyqt5 BuildRequires: python%{python3_pkgversion}-devel @@ -184,6 +192,7 @@ Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major}) = %{_sip_ Provides: python%{python3_pkgversion}-pyqt5-sip-api(%{_sip_api_major})%{?_isa} = %{_sip_api} %description -n python%{python3_pkgversion}-pyqt5-sip This is the Python 3 build of pyqt5-SIP. +%endif %if %{?wx_siplib} %package -n python%{python3_pkgversion}-wx-siplib @@ -277,6 +286,7 @@ pushd %{_target_platform}-python3-pyqt4 %make_build popd +%if %{?pyqt5_sip} mkdir %{_target_platform}-python3-pyqt5 pushd %{_target_platform}-python3-pyqt5 %{__python3} ../configure.py \ @@ -286,6 +296,7 @@ pushd %{_target_platform}-python3-pyqt5 %make_build popd +%endif %if %{?wx_siplib} sed -i -e 's|target = sip|target = siplib|g' siplib/siplib.sbf @@ -312,7 +323,9 @@ sed -i -e 's|target = siplib|target = sip|g' siplib/siplib.sbf %make_install -C %{_target_platform}-python3 %endif %make_install -C %{_target_platform}-python3-pyqt4 +%if %{?pyqt5_sip} %make_install -C %{_target_platform}-python3-pyqt5 +%endif %if %{?wx_siplib} %make_install -C %{_target_platform}-python3-wx mv %{buildroot}%{python3_sitearch}/wx/sip.pyi %{buildroot}%{python3_sitearch}/wx/siplib.pyi @@ -434,12 +447,14 @@ popd %{python3_sitearch}/PyQt4/sip.* %{python3_sitearch}/PyQt4_sip-%{version}.dist-info/ +%if %{?pyqt5_sip} %files -n python%{python3_pkgversion}-pyqt5-sip %doc NEWS README %license LICENSE LICENSE-GPL2 LICENSE-GPL3 %dir %{python3_sitearch}/PyQt5/ %{python3_sitearch}/PyQt5/sip.* %{python3_sitearch}/PyQt5_sip-%{version}.dist-info/ +%endif %if %{?wx_siplib} %files -n python%{python3_pkgversion}-wx-siplib @@ -453,6 +468,9 @@ popd %changelog +* Mon Jun 14 2021 Scott Talbert - 4.19.24-5 +- Stop building python3-pyqt5-sip package on F35+ - replaced by separate pkg + * Thu Jun 03 2021 Python Maint - 4.19.24-4 - Rebuilt for Python 3.10 From 78346fe8f24f92f9b05569b712713c97ce9eb3cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 17:40:55 +0000 Subject: [PATCH 52/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 23779a7..078fc9d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.24 -Release: 5%{?dist} +Release: 6%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -468,6 +468,9 @@ popd %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.19.24-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 14 2021 Scott Talbert - 4.19.24-5 - Stop building python3-pyqt5-sip package on F35+ - replaced by separate pkg From 4bbbecf718a3b9e30d837cd62d21c084b93b14b7 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 21 Oct 2021 13:46:41 +0200 Subject: [PATCH 53/73] Update to 4.19.25 --- .gitignore | 1 + sip-4.18-no_rpath.patch | 10 +++++----- sip-4.18-no_strip.patch | 10 +++++----- sip-4.19.18-no_hardcode_sip_so.patch | 8 ++++---- sip.spec | 7 +++++-- sources | 2 +- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index f7b1e4a..9f9eb15 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /sip-4.19.22.tar.gz /sip-4.19.23.tar.gz /sip-4.19.24.tar.gz +/sip-4.19.25.tar.gz diff --git a/sip-4.18-no_rpath.patch b/sip-4.18-no_rpath.patch index 406a26c..0ae91e4 100644 --- a/sip-4.18-no_rpath.patch +++ b/sip-4.18-no_rpath.patch @@ -1,7 +1,7 @@ -diff -up sip-4.18/siputils.py.no_rpath sip-4.18/siputils.py ---- sip-4.18/siputils.py.no_rpath 2015-03-25 06:00:24.000000000 -0500 -+++ sip-4.18/siputils.py 2016-04-13 11:34:48.179894616 -0500 -@@ -435,7 +435,7 @@ class Makefile: +diff -rupN --no-dereference sip-4.19.25/siputils.py sip-4.19.25-new/siputils.py +--- sip-4.19.25/siputils.py 2021-10-21 13:45:54.808566613 +0200 ++++ sip-4.19.25-new/siputils.py 2021-10-21 13:45:54.812566611 +0200 +@@ -436,7 +436,7 @@ class Makefile: if l_dir in ("", ".", ".."): continue @@ -10,7 +10,7 @@ diff -up sip-4.18/siputils.py.no_rpath sip-4.18/siputils.py if self._python: incdir.append(self.config.py_inc_dir) -@@ -612,7 +612,7 @@ class Makefile: +@@ -613,7 +613,7 @@ class Makefile: # Handle library directories. libdir_qt = self.optional_list("LIBDIR_QT") libdir.extend(libdir_qt) diff --git a/sip-4.18-no_strip.patch b/sip-4.18-no_strip.patch index 3273311..326759e 100644 --- a/sip-4.18-no_strip.patch +++ b/sip-4.18-no_strip.patch @@ -1,7 +1,7 @@ -diff -up sip-4.18/siputils.py.no_strip sip-4.18/siputils.py ---- sip-4.18/siputils.py.no_strip 2015-03-25 06:00:24.000000000 -0500 -+++ sip-4.18/siputils.py 2016-04-13 11:34:23.718690341 -0500 -@@ -1469,7 +1469,7 @@ class ModuleMakefile(Makefile): +diff -rupN --no-dereference sip-4.19.25/siputils.py sip-4.19.25-new/siputils.py +--- sip-4.19.25/siputils.py 2021-02-26 16:17:35.156108000 +0100 ++++ sip-4.19.25-new/siputils.py 2021-10-21 13:45:54.780566626 +0200 +@@ -1473,7 +1473,7 @@ class ModuleMakefile(Makefile): """ def __init__(self, configuration, build_file, install_dir=None, static=0, console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, @@ -10,7 +10,7 @@ diff -up sip-4.18/siputils.py.no_strip sip-4.18/siputils.py export_all=0, universal=None, arch=None, deployment_target=None): """Initialise an instance of a module Makefile. -@@ -1780,7 +1780,7 @@ class SIPModuleMakefile(ModuleMakefile): +@@ -1784,7 +1784,7 @@ class SIPModuleMakefile(ModuleMakefile): """ def __init__(self, configuration, build_file, install_dir=None, static=0, console=0, qt=0, opengl=0, threaded=0, warnings=1, debug=0, diff --git a/sip-4.19.18-no_hardcode_sip_so.patch b/sip-4.19.18-no_hardcode_sip_so.patch index b6fe637..86c453c 100644 --- a/sip-4.19.18-no_hardcode_sip_so.patch +++ b/sip-4.19.18-no_hardcode_sip_so.patch @@ -1,7 +1,7 @@ -diff -up sip-4.19.18/configure.py.orig sip-4.19.18/configure.py ---- sip-4.19.18/configure.py.orig 2019-07-04 12:28:08.000000000 -0400 -+++ sip-4.19.18/configure.py 2019-08-27 21:56:33.871428348 -0400 -@@ -447,7 +447,7 @@ def create_makefiles(macros): +diff -rupN --no-dereference sip-4.19.25/configure.py sip-4.19.25-new/configure.py +--- sip-4.19.25/configure.py 2021-02-26 16:28:41.621025600 +0100 ++++ sip-4.19.25-new/configure.py 2021-10-21 13:45:54.845566597 +0200 +@@ -449,7 +449,7 @@ def create_makefiles(macros): if sys.platform == 'win32': mod = 'sip.lib' if opts.static else 'sip.pyd' else: diff --git a/sip.spec b/sip.spec index 078fc9d..1f4dc72 100644 --- a/sip.spec +++ b/sip.spec @@ -46,8 +46,8 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip -Version: 4.19.24 -Release: 6%{?dist} +Version: 4.19.25 +Release: 1%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -468,6 +468,9 @@ popd %changelog +* Thu Oct 21 2021 Sandro Mani - 4.19.25-1 +- Update to 4.19.25 + * Fri Jul 23 2021 Fedora Release Engineering - 4.19.24-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index f458ce7..bd8dd5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sip-4.19.24.tar.gz) = c9acf8c66da6ff24ffaeed254c11deabbc587cea0eb50164f2016199af30b85980f96a2d754ae5e7fe080f9076673b1abc82e2a6a41ff2ac442fb2b326fca1c0 +SHA512 (sip-4.19.25.tar.gz) = 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001 From 36f2068ec1b5c7c29ce073860c5651b6da015b37 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 8 Nov 2021 19:19:43 -0500 Subject: [PATCH 54/73] Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 Unfortunately, sip 6.4.0 introduced a new directive, py_ssite_t_clean, and PyQt 5.15.6 makes use of this directive. sip 4 doesn't recognize this directive, so any packages that use PyQt5 and still use sip 4 now FTBFS. In order to work around this problem, cherry pick a patch from Debian which adds the new directive to sip 4 (but doesn't do anything) to resolve this FTBFS. This fixes FTBFS for scidavis and krita, at least. --- sip-4.19.25-py_ssize_t_clean.patch | 52 ++++++++++++++++++++++++++++++ sip.spec | 12 ++++++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 sip-4.19.25-py_ssize_t_clean.patch diff --git a/sip-4.19.25-py_ssize_t_clean.patch b/sip-4.19.25-py_ssize_t_clean.patch new file mode 100644 index 0000000..a6f10db --- /dev/null +++ b/sip-4.19.25-py_ssize_t_clean.patch @@ -0,0 +1,52 @@ +From: Jochen Sprickerhof +Date: Fri, 5 Nov 2021 09:13:14 +0100 +Subject: Make parser not break on py_ssize_t_clean directive from SIP v6.4 + +--- + sipgen/metasrc/lexer.l | 1 + + sipgen/metasrc/parser.y | 13 +++++++++++++ + 2 files changed, 14 insertions(+) + +diff --git a/sipgen/metasrc/lexer.l b/sipgen/metasrc/lexer.l +index a52b018..c328202 100644 +--- a/sipgen/metasrc/lexer.l ++++ b/sipgen/metasrc/lexer.l +@@ -174,6 +174,7 @@ SIP_QOBJECT {return TK_QOBJECT;} + timestamp {return TK_TIMESTAMP;} + type {return TK_TYPE;} + use_argument_names {return TK_USEARGNAMES;} ++py_ssize_t_clean {return TK_PYSSIZETCLEAN;} + use_limited_api {return TK_USELIMITEDAPI;} + all_raise_py_exception {return TK_ALLRAISEPYEXC;} + call_super_init {return TK_CALLSUPERINIT;} +diff --git a/sipgen/metasrc/parser.y b/sipgen/metasrc/parser.y +index 5623dca..2d98380 100644 +--- a/sipgen/metasrc/parser.y ++++ b/sipgen/metasrc/parser.y +@@ -389,6 +389,7 @@ static scopedNameDef *fullyQualifiedName(scopedNameDef *snd); + %token TK_TIMESTAMP + %token TK_TYPE + %token TK_USEARGNAMES ++%token TK_PYSSIZETCLEAN + %token TK_USELIMITEDAPI + %token TK_ALLRAISEPYEXC + %token TK_CALLSUPERINIT +@@ -2012,6 +2013,18 @@ module_arg: TK_KWARGS '=' TK_STRING_VALUE { + $$.call_super_init = -1; + $$.def_error_handler = NULL; + } ++ | TK_PYSSIZETCLEAN '=' bool_value { ++ $$.token = TK_PYSSIZETCLEAN; ++ ++ $$.c_module = FALSE; ++ $$.kwargs = defaultKwArgs; ++ $$.name = NULL; ++ $$.use_arg_names = FALSE; ++ $$.use_limited_api = FALSE; ++ $$.all_raise_py_exc = FALSE; ++ $$.call_super_init = -1; ++ $$.def_error_handler = NULL; ++ } + | TK_USELIMITEDAPI '=' bool_value { + $$.token = TK_USELIMITEDAPI; + diff --git a/sip.spec b/sip.spec index 1f4dc72..49c8c05 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 1%{?dist} +Release: 2%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -68,6 +68,8 @@ Patch51: sip-4.18-no_rpath.patch #Patch52: sip-4.19.3-python3_sip_bin.patch # Avoid hardcoding sip.so (needed for wxpython's siplib.so) Patch53: sip-4.19.18-no_hardcode_sip_so.patch +# Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 +Patch54: sip-4.19.25-py_ssize_t_clean.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -78,6 +80,8 @@ Source1: macros.sip BuildRequires: make BuildRequires: gcc-c++ BuildRequires: sed +BuildRequires: bison +BuildRequires: flex Obsoletes: sip-macros < %{version}-%{release} Provides: sip-macros = %{version}-%{release} @@ -216,9 +220,12 @@ This is the Python 3 build of wx-siplib. %patch50 -p1 -b .no_strip %patch51 -p1 -b .no_rpath %patch53 -p1 -b .no_sip_so +%patch54 -p1 -b .py_ssize_t_clean %build +flex --outfile=sipgen/lexer.c sipgen/metasrc/lexer.l +bison --yacc --defines=sipgen/parser.h --output=sipgen/parser.c sipgen/metasrc/parser.y %if %{with python2} %if 0%{?no_namespace} mkdir %{_target_platform}-python2 @@ -468,6 +475,9 @@ popd %changelog +* Mon Nov 08 2021 Scott Talbert - 4.19.25-2 +- Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 + * Thu Oct 21 2021 Sandro Mani - 4.19.25-1 - Update to 4.19.25 From 40ebbaa6f43856d52415a2f60531c279cd885806 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 01:01:16 +0000 Subject: [PATCH 55/73] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 49c8c05..ac60d63 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 2%{?dist} +Release: 3%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -475,6 +475,9 @@ popd %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.19.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Nov 08 2021 Scott Talbert - 4.19.25-2 - Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 From 842c544b1eaa091433a4472f68c712d6a410ede0 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 13 Jun 2022 15:17:57 +0200 Subject: [PATCH 56/73] Rebuilt for Python 3.11 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index ac60d63..67fa005 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 3%{?dist} +Release: 4%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -475,6 +475,9 @@ popd %changelog +* Mon Jun 13 2022 Python Maint - 4.19.25-4 +- Rebuilt for Python 3.11 + * Sat Jan 22 2022 Fedora Release Engineering - 4.19.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 2aa40956d602c67cef14515a48344efaf40d943e Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 17 Jun 2022 12:58:36 +0200 Subject: [PATCH 57/73] Fix error: invalid use of undefined type 'struct _frame' --- sip-4.19.25-pyframe_getback.patch | 13 +++++++++++++ sip.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 sip-4.19.25-pyframe_getback.patch diff --git a/sip-4.19.25-pyframe_getback.patch b/sip-4.19.25-pyframe_getback.patch new file mode 100644 index 0000000..30bab23 --- /dev/null +++ b/sip-4.19.25-pyframe_getback.patch @@ -0,0 +1,13 @@ +diff --git a/siplib/siplib.c b/siplib/siplib.c +index db52b68..8019e97 100644 +--- a/siplib/siplib.c ++++ b/siplib/siplib.c +@@ -13747,7 +13747,7 @@ static struct _frame *sip_api_get_frame(int depth) + + while (frame != NULL && depth > 0) + { +- frame = frame->f_back; ++ frame = PyFrame_GetBack(frame); + --depth; + } + diff --git a/sip.spec b/sip.spec index 67fa005..1156a49 100644 --- a/sip.spec +++ b/sip.spec @@ -70,6 +70,8 @@ Patch51: sip-4.18-no_rpath.patch Patch53: sip-4.19.18-no_hardcode_sip_so.patch # Recognize the py_ssize_t_clean directive to avoid FTBFS with PyQt 5.15.6 Patch54: sip-4.19.25-py_ssize_t_clean.patch +# Fix error: invalid use of undefined type 'struct _frame' +Patch55: sip-4.19.25-pyframe_getback.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -221,6 +223,7 @@ This is the Python 3 build of wx-siplib. %patch51 -p1 -b .no_rpath %patch53 -p1 -b .no_sip_so %patch54 -p1 -b .py_ssize_t_clean +%patch55 -p1 -b .pyframe_getback %build From 91d37abf48edecc3b4ab1847adddb646fb79c883 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 08:43:59 +0000 Subject: [PATCH 58/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 1156a49..62847d3 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 4%{?dist} +Release: 5%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -478,6 +478,9 @@ popd %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.19.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Python Maint - 4.19.25-4 - Rebuilt for Python 3.11 From 0ad5d9db3ad6556ef1378af0b547b6404006cbeb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 03:23:11 +0000 Subject: [PATCH 59/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 62847d3..31c86e4 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 5%{?dist} +Release: 6%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -478,6 +478,9 @@ popd %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.19.25-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 4.19.25-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b6a303041046e1fd39c657c656e21e22f041812f Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Tue, 7 Mar 2023 20:20:56 +0100 Subject: [PATCH 60/73] fixed bz#2154988, fails to build with Python 3.12: ModuleNotFoundError: No module named 'distutils' --- sip.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 31c86e4..be6c403 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 6%{?dist} +Release: 7%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -85,6 +85,8 @@ BuildRequires: sed BuildRequires: bison BuildRequires: flex +BuildRequires: python-setuptools + Obsoletes: sip-macros < %{version}-%{release} Provides: sip-macros = %{version}-%{release} @@ -478,6 +480,9 @@ popd %changelog +* Tue Mar 07 2023 Than Ngo - 4.19.25-7 +- fixed bz#2154988, fails to build with Python 3.12: ModuleNotFoundError: No module named 'distutils' + * Sat Jan 21 2023 Fedora Release Engineering - 4.19.25-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 0c2f14c4519d1b8ea9241c3fdb2ddadc9203425f Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 13 Jun 2023 20:50:10 +0200 Subject: [PATCH 61/73] Rebuilt for Python 3.12 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index be6c403..33d875d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 7%{?dist} +Release: 8%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Tue Jun 13 2023 Python Maint - 4.19.25-8 +- Rebuilt for Python 3.12 + * Tue Mar 07 2023 Than Ngo - 4.19.25-7 - fixed bz#2154988, fails to build with Python 3.12: ModuleNotFoundError: No module named 'distutils' From ecd053a61b179f82eb2cdaacfc433fe0304ebbc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 01:49:05 +0000 Subject: [PATCH 62/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 33d875d..4d9db0c 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 8%{?dist} +Release: 9%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.19.25-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jun 13 2023 Python Maint - 4.19.25-8 - Rebuilt for Python 3.12 From 675d011e68f0345227da9558f81728099acb712b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 03:23:33 +0000 Subject: [PATCH 63/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 4d9db0c..f6164b2 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 9%{?dist} +Release: 10%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.19.25-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 4.19.25-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 0b47969ef1682dd5eba14dcd1e4327c1addd0bd3 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:49 +0200 Subject: [PATCH 64/73] Eliminate use of obsolete %patchN syntax (#2283636) --- sip.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sip.spec b/sip.spec index f6164b2..d21300a 100644 --- a/sip.spec +++ b/sip.spec @@ -221,11 +221,11 @@ This is the Python 3 build of wx-siplib. %setup -q -n %{name}-%{version}%{?snap:.%{snap}} -%patch50 -p1 -b .no_strip -%patch51 -p1 -b .no_rpath -%patch53 -p1 -b .no_sip_so -%patch54 -p1 -b .py_ssize_t_clean -%patch55 -p1 -b .pyframe_getback +%patch -P50 -p1 -b .no_strip +%patch -P51 -p1 -b .no_rpath +%patch -P53 -p1 -b .no_sip_so +%patch -P54 -p1 -b .py_ssize_t_clean +%patch -P55 -p1 -b .pyframe_getback %build From 5e32c23bbebe935e68561426beae2fbc955cdf39 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 7 Jun 2024 09:00:39 +0200 Subject: [PATCH 65/73] Rebuilt for Python 3.13 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index d21300a..5361726 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 10%{?dist} +Release: 11%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Fri Jun 07 2024 Python Maint - 4.19.25-11 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 4.19.25-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e70f79adba6ada151aed940d671b729c6ebad7b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 05:43:23 +0000 Subject: [PATCH 66/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 5361726..4559c9d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 11%{?dist} +Release: 12%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) @@ -480,6 +480,9 @@ popd %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.19.25-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 07 2024 Python Maint - 4.19.25-11 - Rebuilt for Python 3.13 From 8c04d87abb589a8c4ba71ddfcb0e165e1682b483 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 21:58:26 +0200 Subject: [PATCH 67/73] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- sip.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sip.spec b/sip.spec index 4559c9d..fdd9aeb 100644 --- a/sip.spec +++ b/sip.spec @@ -47,10 +47,11 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 12%{?dist} +Release: 13%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) -License: GPLv2 or GPLv3 and (GPLv3+ with exceptions) +# Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. +License: GPL-2.0-only OR GPL-3.0-only AND (LicenseRef-Callaway-GPLv3+-with-exceptions) Url: https://riverbankcomputing.com/software/sip/intro Source0: https://riverbankcomputing.com/static/Downloads/sip/%{version}/sip-%{version}%{?snap:.%{snap}}.tar.gz @@ -480,6 +481,9 @@ popd %changelog +* Wed Sep 04 2024 Miroslav Suchý - 4.19.25-13 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.19.25-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b9d9920e0403dccf3eac36e2fb22fa367f465111 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 10:50:49 +0000 Subject: [PATCH 68/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index fdd9aeb..8d2960d 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 13%{?dist} +Release: 14%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.19.25-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 4.19.25-13 - convert license to SPDX From c50999f171ba97a888f8d85eee86cb96a22c7777 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Mon, 2 Jun 2025 20:37:55 +0200 Subject: [PATCH 69/73] Rebuilt for Python 3.14 --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 8d2960d..5fd22ce 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 14%{?dist} +Release: 15%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Mon Jun 02 2025 Python Maint - 4.19.25-15 +- Rebuilt for Python 3.14 + * Sun Jan 19 2025 Fedora Release Engineering - 4.19.25-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6f3c12fee00a2764fa46dc1aabca9a36d5419fce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:21:44 +0000 Subject: [PATCH 70/73] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 5fd22ce..8b246f1 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 15%{?dist} +Release: 16%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.19.25-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jun 02 2025 Python Maint - 4.19.25-15 - Rebuilt for Python 3.14 From a85112733e465e61f383a24343d72adfe5baa2b5 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:17:58 +0200 Subject: [PATCH 71/73] Rebuilt for Python 3.14.0rc2 bytecode --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index 8b246f1..cba4e00 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 16%{?dist} +Release: 17%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Fri Aug 15 2025 Python Maint - 4.19.25-17 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 4.19.25-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 7245e3021ae160ab59a76cfb9a76121d15f85f32 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 14:56:40 +0200 Subject: [PATCH 72/73] Rebuilt for Python 3.14.0rc3 bytecode --- sip.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sip.spec b/sip.spec index cba4e00..b8b05a5 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 17%{?dist} +Release: 18%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -481,6 +481,9 @@ popd %changelog +* Fri Sep 19 2025 Python Maint - 4.19.25-18 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 4.19.25-17 - Rebuilt for Python 3.14.0rc2 bytecode From cc94854a864152c00ed04a41c16a19cfb7cd0baa Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 27 Nov 2025 12:49:29 +0100 Subject: [PATCH 73/73] =?UTF-8?q?Fix=20rhbz#2414555=20-=20error:=20implici?= =?UTF-8?q?t=20declaration=20of=20function=20=E2=80=98PyWeakref=5FGetObjec?= =?UTF-8?q?t=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sip-4.19.25-ftbfs-python-3.15.patch | 20 ++++++++++++++++++++ sip.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 sip-4.19.25-ftbfs-python-3.15.patch diff --git a/sip-4.19.25-ftbfs-python-3.15.patch b/sip-4.19.25-ftbfs-python-3.15.patch new file mode 100644 index 0000000..31ec6b9 --- /dev/null +++ b/sip-4.19.25-ftbfs-python-3.15.patch @@ -0,0 +1,20 @@ +diff -up sip-4.19.25/siplib/qtlib.c.pyweekref_getobject sip-4.19.25/siplib/qtlib.c +--- sip-4.19.25/siplib/qtlib.c.pyweekref_getobject 2021-02-26 16:17:35.136483000 +0100 ++++ sip-4.19.25/siplib/qtlib.c 2025-11-12 18:23:13.020805318 +0100 +@@ -24,6 +24,16 @@ + + #include "sipint.h" + ++// Fix FTBFS with python3.15 ++#if PY_VERSION_HEX >= 0x30F00A1 ++static inline PyObject *compat_PyWeakref_GetObject(PyObject *ref) { ++ PyObject *obj = NULL; ++ if (PyWeakref_GetRef(ref, &obj) < 0) ++ return NULL; ++ return obj; ++} ++#define PyWeakref_GetObject compat_PyWeakref_GetObject ++#endif + + /* This is how Qt "types" signals and slots. */ + #define isQtSlot(s) (*(s) == '1') diff --git a/sip.spec b/sip.spec index b8b05a5..c4c77e6 100644 --- a/sip.spec +++ b/sip.spec @@ -47,7 +47,7 @@ Summary: SIP - Python/C++ Bindings Generator Name: sip Version: 4.19.25 -Release: 18%{?dist} +Release: 19%{?dist} # sipgen/parser.{c.h} is GPLv3+ with exceptions (bison) # Automatically converted from old format: GPLv2 or GPLv3 and (GPLv3+ with exceptions) - review is highly recommended. @@ -73,6 +73,8 @@ Patch53: sip-4.19.18-no_hardcode_sip_so.patch Patch54: sip-4.19.25-py_ssize_t_clean.patch # Fix error: invalid use of undefined type 'struct _frame' Patch55: sip-4.19.25-pyframe_getback.patch +# Fix error: implicit declaration of function ‘PyWeakref_GetObject’ +Patch56: sip-4.19.25-ftbfs-python-3.15.patch # extracted from sip.h, SIP_API_MAJOR_NR SIP_API_MINOR_NR defines Source1: macros.sip @@ -227,6 +229,7 @@ This is the Python 3 build of wx-siplib. %patch -P53 -p1 -b .no_sip_so %patch -P54 -p1 -b .py_ssize_t_clean %patch -P55 -p1 -b .pyframe_getback +%patch -P56 -p1 -b .pyweekref_getobject %build @@ -481,6 +484,9 @@ popd %changelog +* Thu Nov 27 2025 Than Ngo - 4.19.25-19 +- Fix rhbz#2414555 - error: implicit declaration of function ‘PyWeakref_GetObject’ + * Fri Sep 19 2025 Python Maint - 4.19.25-18 - Rebuilt for Python 3.14.0rc3 bytecode