From e642d8d11d9f6a5fbf825a000f63fd8b8ae0cdb50e7a7d7b08142e454b5ca735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Thu, 3 Oct 2024 17:49:51 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main presage revision 8f33349bf7782db6d0cf9fdd4725ede3 --- presage.changes | 12 ++++++++++++ presage.spec | 18 +++++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/presage.changes b/presage.changes index 801206a..d971c09 100644 --- a/presage.changes +++ b/presage.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Mar 13 09:37:25 UTC 2024 - pgajdos@suse.com + +- remove dependency on /usr/bin/python3 using + %python3_fix_shebang macro, [bsc#1212476] + +------------------------------------------------------------------- +Thu Feb 29 14:49:50 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN. + ------------------------------------------------------------------- Mon May 15 13:57:20 UTC 2023 - Frederic Crozat diff --git a/presage.spec b/presage.spec index 8d8b29b..4bc24b2 100644 --- a/presage.spec +++ b/presage.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package presage # -# 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 @@ -216,18 +216,9 @@ This package contains the libpresage API Documentation in HTML format. %endif %prep -%setup -q -n %{sname}-%{version} +%autosetup -p1 -n %{sname}-%{version} + find . -type f -exec sed -i 's/\r//g' "{}" \; -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 echo "[D-BUS Service]" > apps/dbus/org.gnome.presage.service.in echo "Name=org.gnome.presage.beta" >> apps/dbus/org.gnome.presage.service.in echo "Exec={bindir}/presage_dbus_service --start" >> apps/dbus/org.gnome.presage.service.in @@ -274,6 +265,7 @@ sed -i -e '1 s#/usr/bin/env.*python#/usr/bin/python3#' %{buildroot}%{_bindir}/pr %suse_update_desktop_file pyprompter Utility DesktopUtility %fdupes %{buildroot}/%{_prefix} +%python3_fix_shebang %else