From a2d945fc8af98003006343ea793abb6d3eb3a5186c3fdb73a2bedae4276ce377 Mon Sep 17 00:00:00 2001 From: Edgar Aichinger Date: Sat, 3 Feb 2024 10:12:08 +0000 Subject: [PATCH] Accepting request 1143775 from home:dimstar:Factory - Use python3-base to build instead of python-base (aka python2): waf uses a /usr/bin/env python shebang, but the script is fully compatible with python3. Call it explicitly as python3 waf. OBS-URL: https://build.opensuse.org/request/show/1143775 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/non-ntk?expand=0&rev=22 --- non-ntk.changes | 7 +++++++ non-ntk.spec | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/non-ntk.changes b/non-ntk.changes index 7d577e3..7c67e16 100644 --- a/non-ntk.changes +++ b/non-ntk.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Feb 3 10:08:33 UTC 2024 - Dominique Leuenberger + +- Use python3-base to build instead of python-base (aka python2): + waf uses a /usr/bin/env python shebang, but the script is fully + compatible with python3. Call it explicitly as python3 waf. + ------------------------------------------------------------------- Thu Aug 3 13:06:03 UTC 2023 - Edgar Aichinger diff --git a/non-ntk.spec b/non-ntk.spec index 87888d6..0e7f114 100644 --- a/non-ntk.spec +++ b/non-ntk.spec @@ -1,7 +1,7 @@ # # spec file for package non-ntk # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,8 +39,8 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(xft) -# needed by ./waf -BuildRequires: python-base +# ./waf has a env python shebang, but is also compatible with python3 +BuildRequires: python3-base BuildRequires: gcc-c++ %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -84,12 +84,12 @@ sed -i -e "s|append_value('C\(.*\)FLAGS', CFLAGS|append_value('C\1FLAGS','%{optf wscript %build -LDFLAGS="%{?__global_ldflags}" ./waf -v configure --prefix=%{_prefix} \ +LDFLAGS="%{?__global_ldflags}" python3 ./waf -v configure --prefix=%{_prefix} \ --libdir=%{_libdir} --enable-gl -./waf -v %{?_smp_mflags} +python3 ./waf -v %{?_smp_mflags} %install -./waf -v install --destdir=%{buildroot} +python3 ./waf -v install --destdir=%{buildroot} install -d -m 0755 %{buildroot}%{_datadir}/applications install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ntk-fluid.desktop rm %{buildroot}%{_libdir}/libntk*.a*