[checkmk-commits] Check_MK Git: check_mk: RPM: use BuildArch: noarch

Module: check_mk Branch: master Commit: 63fd6adc21d605eab32db8b1831736f145553ed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=63fd6adc21d605… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Feb 27 13:16:48 2011 +0100 RPM: use BuildArch: noarch --- ChangeLog | 2 ++ Makefile | 2 +- check_mk.spec | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 309aa11..6dd0f1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ they are not SNMP hosts. * FIX: precompile: make sure check includes are added before actual checks + * RPM: use BuildArch: noarch in spec file rather than as a command + line option (thanks to Ulrich Kiermayr) Checks & Agents: * FIX: drbd now handles output of older version without an ep field diff --git a/Makefile b/Makefile index 574c130..87d7dee 100644 --- a/Makefile +++ b/Makefile @@ -130,7 +130,7 @@ rpm $(DISTNAME)-1.noarch.rpm: $(MAKE) dist cp $(DISTNAME).tar.gz $(RPM_TOPDIR)/SOURCES sed "s/^Version:.*/Version: $(VERSION)/" $(NAME).spec > $(NAME)-$(VERSION).spec - rpmbuild -ba --target=noarch --buildroot "$$(pwd)/$(RPM_BUILDROOT)" --define "_topdir $$(pwd)/$(RPM_TOPDIR)" $(NAME)-$(VERSION).spec + rpmbuild -ba --buildroot "$$(pwd)/$(RPM_BUILDROOT)" --define "_topdir $$(pwd)/$(RPM_TOPDIR)" $(NAME)-$(VERSION).spec rm -f $(DISTNAME).spec mv -v $(RPM_TOPDIR)/RPMS/*/* . mv -v $(RPM_TOPDIR)/SRPMS/* . diff --git a/check_mk.spec b/check_mk.spec index 18a7d1a..c834767 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -33,6 +33,8 @@ Source: check_mk-%{version}.tar.gz BuildRoot: /tmp/rpm.buildroot.check_mk-%{version} AutoReq: off AutoProv: off +BuildArch: noarch + %description check_mk is a xinetd-based remote agent for monitoring Linux and Unix-Servers