From 024c2a8232e1ee660f09b66c8d10c7eb1d55cec2da0fe693dc24e08912e605bd Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Thu, 1 Feb 2024 12:51:18 +0000 Subject: [PATCH 1/3] Accepting request 1143356 from home:alarrosa:branches:M17N - Use %python3_fix_shebang OBS-URL: https://build.opensuse.org/request/show/1143356 OBS-URL: https://build.opensuse.org/package/show/M17N/ttf-converter?expand=0&rev=12 --- ttf-converter.changes | 5 +++++ ttf-converter.spec | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ttf-converter.changes b/ttf-converter.changes index 1ca1548..21c1c32 100644 --- a/ttf-converter.changes +++ b/ttf-converter.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Feb 1 12:46:52 UTC 2024 - Antonio Larrosa + +- Use %python3_fix_shebang + ------------------------------------------------------------------- Thu Sep 28 11:16:39 UTC 2023 - Jan Engelhardt diff --git a/ttf-converter.spec b/ttf-converter.spec index ec6fc56..89bd091 100644 --- a/ttf-converter.spec +++ b/ttf-converter.spec @@ -1,7 +1,7 @@ # # spec file for package ttf-converter # -# Copyright (c) 2023 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 @@ -50,7 +50,8 @@ instead. %install mkdir -p %{buildroot}%{_bindir} -cp ttf-converter %{buildroot}%{_bindir} +install ttf-converter %{buildroot}%{_bindir} +%python3_fix_shebang %files %license LICENSE From adea3466e127dc350167d28c86828434a01be8f1aabbba56c6bc8e341c53b08b Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Fri, 2 Feb 2024 06:16:41 +0000 Subject: [PATCH 2/3] Accepting request 1143550 from home:alarrosa:branches:M17N - Reduce the BuildRequires from python3 to just python-rpm-macros and Require: %{primary_python}-base instead of python3-base which might be off for a short time when %primary_python changes. OBS-URL: https://build.opensuse.org/request/show/1143550 OBS-URL: https://build.opensuse.org/package/show/M17N/ttf-converter?expand=0&rev=13 --- ttf-converter.changes | 7 +++++++ ttf-converter.spec | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ttf-converter.changes b/ttf-converter.changes index 21c1c32..639d350 100644 --- a/ttf-converter.changes +++ b/ttf-converter.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Feb 1 13:23:03 UTC 2024 - Antonio Larrosa + +- Reduce the BuildRequires from python3 to just python-rpm-macros + and Require: %{primary_python}-base instead of python3-base + which might be off for a short time when %primary_python changes. + ------------------------------------------------------------------- Thu Feb 1 12:46:52 UTC 2024 - Antonio Larrosa diff --git a/ttf-converter.spec b/ttf-converter.spec index 89bd091..0ed8775 100644 --- a/ttf-converter.spec +++ b/ttf-converter.spec @@ -23,10 +23,10 @@ Summary: Python script that converts fonts to TrueType format License: GPL-3.0-only URL: https://github.com/antlarr-suse/ttf-converter Source: ttf-converter-%{version}.tar.xz -BuildRequires: python3 +BuildRequires: python-rpm-macros +Requires: %{primary_python}-base Requires: fontforge Requires: ftdump -Requires: python3-base BuildArch: noarch %description From 0cde5527448741e9df391515673d9883910150529194ec6c0bd7f4a469130dcb Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Fri, 2 Feb 2024 06:39:55 +0000 Subject: [PATCH 3/3] Accepting request 1143554 from home:alarrosa:branches:M17N - Fix for SLE 15 where %primary_python is not defined. OBS-URL: https://build.opensuse.org/request/show/1143554 OBS-URL: https://build.opensuse.org/package/show/M17N/ttf-converter?expand=0&rev=14 --- ttf-converter.changes | 5 +++++ ttf-converter.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/ttf-converter.changes b/ttf-converter.changes index 639d350..b7e507c 100644 --- a/ttf-converter.changes +++ b/ttf-converter.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 2 06:34:59 UTC 2024 - Antonio Larrosa + +- Fix for SLE 15 where %primary_python is not defined. + ------------------------------------------------------------------- Thu Feb 1 13:23:03 UTC 2024 - Antonio Larrosa diff --git a/ttf-converter.spec b/ttf-converter.spec index 0ed8775..29ae6ac 100644 --- a/ttf-converter.spec +++ b/ttf-converter.spec @@ -16,6 +16,9 @@ # +%if 0%{suse_version} < 1550 +%define primary_python python3 +%endif Name: ttf-converter Version: 1.0.7 Release: 0