summaryrefslogtreecommitdiff
path: root/sysui/CustomTarget_rpm.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-03-03 16:23:23 +0100
committerDavid Tardon <dtardon@redhat.com>2013-03-03 16:27:03 +0100
commit29c8b9a7c9a4d62b7df2e70b71beec488aae5722 (patch)
tree50bfcceec9f012aba5152669af9fa20eace3082a /sysui/CustomTarget_rpm.mk
parent4745b6edcd710204758ceb35dfc0ff78c391810b (diff)
silence rpmbuild
Change-Id: Iee5fbadb4eafb1c919bfcef7799e2e81ca3438d8
Diffstat (limited to 'sysui/CustomTarget_rpm.mk')
-rw-r--r--sysui/CustomTarget_rpm.mk34
1 files changed, 20 insertions, 14 deletions
diff --git a/sysui/CustomTarget_rpm.mk b/sysui/CustomTarget_rpm.mk
index 8d6c433e1e82..cd9b3d1aec91 100644
--- a/sysui/CustomTarget_rpm.mk
+++ b/sysui/CustomTarget_rpm.mk
@@ -16,20 +16,26 @@ define rpm_register_target
$(call gb_CustomTarget_get_target,sysui/rpm): $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
$(rpm_WORKDIR)/$(1)-desktop-integration.tar.gz: $(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm
-$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm: $(rpm_SRCDIR)/$(2)/$(2)-menus.spec $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh
- $(RPM) -bb $$< \
- --buildroot $(rpm_WORKDIR)/$(1)/$(2) \
- --define "_builddir $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)" \
- --define "_rpmdir $(rpm_WORKDIR)/$(1)" \
- --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
- --define "productname $(PRODUCTNAME.$(1))" \
- --define "pkgprefix $(1)$(PKGVERSIONSHORT)" \
- --define "unixfilename $(UNIXFILENAME.$(1))" \
- --define "productversion $(PRODUCTVERSION)" \
- --define "iconprefix $(UNIXFILENAME.$(1))" \
- --define "version $(PKGVERSION)" \
- --define "release $(LIBO_VERSION_PATCH)" \
- --define "__debug_install_post %nil"
+$(rpm_WORKDIR)/$(1)/$(1)$(PKGVERSIONSHORT)-$(2)-menus-$(PKGVERSION)-$(LIBO_VERSION_PATCH).noarch.rpm : \
+ $(rpm_SRCDIR)/$(2)/$(2)-menus.spec \
+ $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)/create_tree.sh \
+ | $(rpm_WORKDIR)/$(1)/.dir
+ $(call gb_Helper_print_on_error,\
+ $(RPM) -bb $$< \
+ --buildroot $(rpm_WORKDIR)/$(1)/$(2) \
+ --define "_builddir $(call gb_CustomTarget_get_workdir,sysui/share)/$(1)" \
+ --define "_rpmdir $(rpm_WORKDIR)/$(1)" \
+ --define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
+ --define "productname $(PRODUCTNAME.$(1))" \
+ --define "pkgprefix $(1)$(PKGVERSIONSHORT)" \
+ --define "unixfilename $(UNIXFILENAME.$(1))" \
+ --define "productversion $(PRODUCTVERSION)" \
+ --define "iconprefix $(UNIXFILENAME.$(1))" \
+ --define "version $(PKGVERSION)" \
+ --define "release $(LIBO_VERSION_PATCH)" \
+ --define "__debug_install_post %nil" \
+ , $$@.log \
+ )
endef
$(eval $(call gb_CustomTarget_CustomTarget,sysui/rpm))