From 0add6dbacbed852f2b5180e04571f039cbf9dd0b Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Thu, 15 Feb 2018 16:37:23 +0100 Subject: tdf#115554: Fix ownership in desktop-integration tars Use fakeroot to call tar when creating the tar.gz archives holding the desktop-integration parts to have root:root as owner of the files inside those. Change-Id: Idcdcb4dd398f330773671266dafb354711b0f093 Reviewed-on: https://gerrit.libreoffice.org/49827 Reviewed-by: Michael Stahl Tested-by: Michael Stahl Reviewed-by: Thorsten Behrens --- sysui/CustomTarget_deb.mk | 2 +- sysui/CustomTarget_rpm.mk | 2 +- sysui/CustomTarget_solaris.mk | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index dd75ee913c62..92cda34a3bfe 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -25,7 +25,7 @@ $(foreach product,$(PRODUCTLIST),\ )) $(deb_WORKDIR)/%-desktop-integration.tar.gz: $(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb - $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@ + fakeroot $(GNUTAR) -C $(deb_WORKDIR) -cf - $(notdir $<) | gzip > $@ $(deb_WORKDIR)/%/DEBIAN/postrm: $(deb_SRCDIR)/postrm cat $< | tr -d "\015" | \ diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk index 8cc56ed80e34..a76b4161e2af 100644 --- a/sysui/CustomTarget_rpm.mk +++ b/sysui/CustomTarget_rpm.mk @@ -54,6 +54,6 @@ $(foreach product,$(PRODUCTLIST),\ )) $(rpm_WORKDIR)/%-desktop-integration.tar.gz: - $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@ + fakeroot $(GNUTAR) -C $(rpm_WORKDIR)/$* -cf - $(foreach distro,$(RPMDISTROS),$*$(PKGVERSIONSHORT)-$(distro)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm) | gzip > $@ # vim: set noet sw=4 ts=4: diff --git a/sysui/CustomTarget_solaris.mk b/sysui/CustomTarget_solaris.mk index 20072fe0cd7f..42a0a8a90633 100644 --- a/sysui/CustomTarget_solaris.mk +++ b/sysui/CustomTarget_solaris.mk @@ -50,6 +50,6 @@ $(solaris_WORKDIR)/%/prototype: $(solaris_SRCDIR)/prototype $(solaris_WORKDIR)/%-desktop-integration.tar.gz: $(solaris_WORKDIR)/%/copyright $(solaris_WORKDIR)/%/pkginfo $(solaris_WORKDIR)/%/depend $(solaris_WORKDIR)/%/mailcap $(solaris_WORKDIR)/%/postinstall $(solaris_WORKDIR)/%/postremove $(solaris_WORKDIR)/%/prototype $(call gb_CustomTarget_get_workdir,sysui/share)/%/openoffice.org.xml # pkgmk -l 1073741824 -r $(solaris_WORKDIR) -f $(solaris_WORKDIR)/$*/prototype -o -d $(solaris_WORKDIR) ARCH=all VERSION=$(PKGVERSION.$*) - $(GNUTAR) -cf - -C $(solaris_WORKDIR) $* | gzip > $@ + fakeroot $(GNUTAR) -cf - -C $(solaris_WORKDIR) $* | gzip > $@ # vim: set noet sw=4 ts=4: -- cgit v1.2.3