From c2d6ad4bad413df4026e87bb5cdc712a3dfb363d Mon Sep 17 00:00:00 2001 From: Sebastião Guerra Date: Tue, 22 Sep 2026 06:25:09 -0300 Subject: RPM tdebindings: update packaging for TDE master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RPM tdebindings: update packaging for TDE master Consolidate the final validated packaging changes for tdebindings from the Tumbleweed build series. Original commits represented: 1. Signed-off-by: Sebastião Guerra --- redhat/core/tdebindings/tdebindings-python3-sysconfig.patch | 9 +++++++++ redhat/core/tdebindings/tdebindings.spec | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 redhat/core/tdebindings/tdebindings-python3-sysconfig.patch diff --git a/redhat/core/tdebindings/tdebindings-python3-sysconfig.patch b/redhat/core/tdebindings/tdebindings-python3-sysconfig.patch new file mode 100644 index 000000000..95e862765 --- /dev/null +++ b/redhat/core/tdebindings/tdebindings-python3-sysconfig.patch @@ -0,0 +1,9 @@ +--- a/dcoppython/configure.in.in ++++ b/dcoppython/configure.in.in +@@ -12,5 +12,5 @@ + fi + if test -n "$PYTHON"; then +- python_site=$($PYTHON -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())') ++ python_site=$($PYTHON -c 'import sysconfig; print(sysconfig.get_path("platlib"))') + AC_SUBST(PYTHON_SITE, $python_site) + fi diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec index 8d45fbc33..334ecdaa9 100644 --- a/redhat/core/tdebindings/tdebindings.spec +++ b/redhat/core/tdebindings/tdebindings.spec @@ -70,10 +70,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: %{name}-rpmlintrc +Patch0: tdebindings-python3-sysconfig.patch BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} +%if 0%{?suse_version} +BuildRequires: tqt3-dev-tools >= 3.5.0 +%endif + BuildRequires: autoconf automake libtool m4 BuildRequires: gcc-c++ BuildRequires: desktop-file-utils @@ -89,7 +94,11 @@ BuildRequires: brp-check-trinity %endif # ZLIB support +%if 0%{?suse_version} +BuildRequires: zlib-ng-compat-devel +%else BuildRequires: zlib-devel +%endif # PERL module support BuildRequires: perl(ExtUtils::MakeMaker) @@ -264,7 +273,7 @@ BuildRequires: java-1.6.0-openjdk-devel %endif %if 0%{?suse_version} -%define java_home %{_usr}/%{_lib}/jvm/java +%define java_home %{_usr}/%{_lib}/jvm/java-1.8.0-openjdk %else %if 0%{?rhel} == 4 %define java_home %{_usr}/lib/jvm/java-1.4.2-gcj-1.4.2.0 @@ -1075,6 +1084,7 @@ This package contains the development files for the TDE bindings. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +%patch -P 0 -p1 %if "%{?perl_vendorarch}" == "" exit 1 -- cgit v1.2.3