sysui/CustomTarget_rpm.mk | 1 +
sysui/desktop/freedesktop/freedesktop-menus.spec | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 52b3b38f1448d2468a3e9edec758515151dc067b
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Sun Sep 22 20:34:12 2024 +0200
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Sun Sep 22 22:26:18 2024 +0200
Adapt to RPM 4.20
...which builds the spec file's code in a dedicated directory now, see
<https://github.com/rpm-software-management/rpm/issues/2078> "RFE:
introduce an
rpm-controlled per-build directory to builds", and no longer in the
directory
from which rpm is invoked. So invent some libo_start_dir parameter to
communicate that directory into the rpm build.
Change-Id: I28268837caafe3b892f76e936dfa747fe13fb9bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/173779
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Tested-by: Jenkins
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index c0ef34cc7d4d..075d3e324b27 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -36,6 +36,7 @@
$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSI
--define "version $(PKGVERSION)" \
--define "release $(LIBO_VERSION_PATCH)" \
--define "__debug_install_post %nil" \
+ --define "libo_start_dir
$(gb_CustomTarget_workdir)/sysui/share/$(1)" \
, $$@.log \
)
endef
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec
b/sysui/desktop/freedesktop/freedesktop-menus.spec
index ff083d71fe9c..9c84305e51b6 100644
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -60,7 +60,7 @@ export KDEMAINDIR=/usr
export PREFIXDIR=/usr
export BINDIR=/usr/bin
-./create_tree.sh
+(cd %libo_start_dir && ./create_tree.sh)
cd $RPM_BUILD_ROOT
