From 522ce0f11a299e2a7b3d5dd9e4f941e63d6165d6 Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:08 -0300 Subject: RPM pytqt: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM pytqt: update packaging for TDE master Consolidate the final validated packaging changes for pytqt from the Tumbleweed build series. Original commits represented: 2. Signed-off-by: Sebastião Guerra --- redhat/dependencies/pytqt/pytqt.spec | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec index 9aa0eecf0..f3ce2a3c6 100644 --- a/redhat/dependencies/pytqt/pytqt.spec +++ b/redhat/dependencies/pytqt/pytqt.spec @@ -57,7 +57,7 @@ License: GPLv2+ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Source0: %{name}-R%{tde_version}%{?preversion:~%{preversion}}.tar.gz Obsoletes: trinity-PyQt < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-python-qt3 < %{?epoch:%{epoch}:}%{version}-%{release} @@ -65,20 +65,26 @@ Obsoletes: trinity-python-tqt < %{?epoch:%{epoch}:}%{version}-%{release} Provides: trinity-python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} BuildRequires: tqt3-apps-devel >= 3.5.0 -BuildRequires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 -BuildRequires: trinity-filesystem >= %{tde_version} +BuildRequires: libtqt3-mt-devel >= 3.5.0 +BuildRequires: tqt3-dev-tools >= 3.5.0 BuildRequires: sip4-tqt-devel >= %{?epoch:%{epoch}:}4.10.5 BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1 BuildRequires: gcc-c++ # PYTHON support +%if 0%{?suse_version} +%global python python311 +%global __python /usr/bin/python3.11 +%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))") +%else %if "%{python}" == "" %global python python3 %endif %global __python %__python3 %global python_sitearch %{python3_sitearch} %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif BuildRequires: %{python} BuildRequires: %{python}-devel @@ -127,9 +133,8 @@ same way in both languages (with syntax differences, of course) %package -n pytqt Summary: TQt bindings for Python Group: Development/Libraries/Python -Requires: trinity-filesystem >= %{tde_version} Requires: sip4-tqt >= %{?epoch:%{epoch}:}4.10.5 -Requires: libtqt4 >= %{?epoch:%{epoch}:}4.2.0 +Requires: libtqt3-mt >= 3.5.0 Obsoletes: python-tqt < %{?epoch:%{epoch}:}%{version}-%{release} Provides: python-tqt = %{?epoch:%{epoch}:}%{version}-%{release} @@ -225,7 +230,7 @@ Summary: TQt bindings for Python - Development files Group: Development/Libraries/Python Requires: pytqt = %{?epoch:%{epoch}:}%{version}-%{release} Requires: trinity-pytqt-tools = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: libtqt4-devel >= %{?epoch:%{epoch}:}4.2.0 +Requires: libtqt3-mt-devel >= 3.5.0 Obsoletes: python-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} Provides: python-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} @@ -256,7 +261,7 @@ packages based on them, like PyTDE. ########## %prep -%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%setup -q -n %{name}-R%{tde_version}%{?preversion:~%{preversion}} %build -- cgit v1.2.3