strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adapt to RPM 4.20

Browse source 
...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.bergmann@allotropia.de>
Tested-by: Jenkins
This commit is contained in:
Stephan Bergmann 2024-09-22 20:34:12 +02:00
parent 3194b9b42e
commit 52b3b38f14
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysui/CustomTarget_rpm.mk
View file

@ -36,6 +36,7 @@ $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSI
--define "version $(PKGVERSION)" \ --define "version $(PKGVERSION)" \
--define "release $(LIBO_VERSION_PATCH)" \ --define "release $(LIBO_VERSION_PATCH)" \
--define "__debug_install_post %nil" \ --define "__debug_install_post %nil" \
--define "libo_start_dir $(gb_CustomTarget_workdir)/sysui/share/$(1)" \
, $$@.log \ , $$@.log \
) )
endef endef

2
sysui/desktop/freedesktop/freedesktop-menus.spec
View file

@ -60,7 +60,7 @@ export KDEMAINDIR=/usr
export PREFIXDIR=/usr export PREFIXDIR=/usr
export BINDIR=/usr/bin export BINDIR=/usr/bin
./create_tree.sh (cd %libo_start_dir && ./create_tree.sh)
cd $RPM_BUILD_ROOT cd $RPM_BUILD_ROOT