Sync from SUSE:SLFO:1.1 presage revision 64552b3200e2254145c388d928333608

presage-setuptools.patch

@@ -1,26 +0,0 @@
-Index: presage-0.9.1/apps/python/Makefile.am
-===================================================================
---- presage-0.9.1.orig/apps/python/Makefile.am
-+++ presage-0.9.1/apps/python/Makefile.am
-@@ -70,7 +70,7 @@ install-exec-local:
- 		$(PYTHON) setup.py install --prefix="$$NATIVE_WINDOWS_PREFIX" \
- 	  ;; \
- 	  *) \
--		$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) \
-+		$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) \
- 	  ;; \
- 	esac;
- 
-Index: presage-0.9.1/bindings/python/Makefile.am
-===================================================================
---- presage-0.9.1.orig/bindings/python/Makefile.am
-+++ presage-0.9.1/bindings/python/Makefile.am
-@@ -60,7 +60,7 @@ install-exec-local:
- 		$(PYTHON) setup.py install --prefix="$$NATIVE_WINDOWS_PREFIX" \
- 	  ;; \
- 	  *) \
--		$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) \
-+		$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix) \
- 	  ;; \
- 	esac;
- 

presage.changes

@@ -1,26 +1,3 @@
--------------------------------------------------------------------
-Mon Dec 30 09:54:07 UTC 2024 - Bernhard Wiedemann <bwiedemann@suse.com>
-
-- Avoid corrupted .png files and fix reproducible builds (boo#1234897)
-
--------------------------------------------------------------------
-Fri Dec  6 07:54:09 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
-
-- Add presage-setuptools.patch: Fix installation of python bindings
-  with setuptools 76.
-
--------------------------------------------------------------------
-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 <dimstar@opensuse.org>
-
-- Use %autosetup macro. Allows to eliminate the usage of deprecated
-  %patchN.
-
 -------------------------------------------------------------------
 Mon May 15 13:57:20 UTC 2023 - Frederic Crozat <fcrozat@suse.com>
 

presage.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package presage
+# spec file
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -50,8 +50,6 @@ Patch7:         presage-buildcycle.diff
 Patch8:         presage-0.9.1-python3.patch
 # PATCH-FIX-UPSTREAM fix ISO C++17 does not allow dynamic exception specifications
 Patch9:         presage-0.9.1-gcc11.patch
-# PATCH-FIX-UPSTREAM Fix installation of python bindings with recent setuptools
-Patch10:        presage-setuptools.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
@@ -218,9 +216,18 @@ This package contains the libpresage API Documentation in HTML format.
 %endif
 
 %prep
-%autosetup -p1 -n %{sname}-%{version}
-
-find . -type f \( \! -name '*.png' -a \! -name 'presage_python_demo.1' \) -exec sed -i  's/\r//g' "{}" \;
+%setup -q -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
@@ -267,7 +274,6 @@ 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