Sync from SUSE:SLFO:Main presage revision 33a9174ddeae055af0e4547403395277

This commit is contained in:
Adrian Schröter 2025-01-13 12:18:37 +01:00
parent e642d8d11d
commit 1f6d049e98
3 changed files with 40 additions and 1 deletions

26
presage-setuptools.patch Normal file
View File

@ -0,0 +1,26 @@
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;

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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

View File

@ -50,6 +50,8 @@ 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,7 +220,7 @@ This package contains the libpresage API Documentation in HTML format.
%prep
%autosetup -p1 -n %{sname}-%{version}
find . -type f -exec sed -i 's/\r//g' "{}" \;
find . -type f \( \! -name '*.png' -a \! -name 'presage_python_demo.1' \) -exec sed -i 's/\r//g' "{}" \;
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