From b2972f319968e46cbf1ba59880340c7c024455a1 Mon Sep 17 00:00:00 2001 From: Mark Huang Date: Wed, 14 Apr 2004 18:05:30 +0000 Subject: [PATCH] - add "--define date" to RPMFLAGS if DATE is defined - get ARCH from the spec file template, not from rpm --showrc (e.g. yum) --- Makerules | 7 ++++--- Rules.mk | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makerules b/Makerules index 5c3ceb61..8f4f7e12 100644 --- a/Makerules +++ b/Makerules @@ -32,7 +32,7 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: Makerules,v 1.5 2004/04/09 19:37:19 alk-pl_rpm Exp $ +# $Id: Makerules,v 1.6 2004/04/12 19:56:02 mlh-pl_rpm Exp $ # # Base cvsps and rpmbuild in the current directory @@ -163,8 +163,9 @@ endif # Build # -NVR := $(shell rpmquery $(RPMFLAGS) $(if $(DATE),--define "date $(DATE)") --specfile SPECS/$(notdir $(SPEC)).in 2>/dev/null | head -1) -ARCH := $(shell rpm $(RPMFLAGS) --showrc | sed -ne 's/^build arch[ ]*:[ ]*\(.*\)/\1/p') +RPMFLAGS += $(if $(DATE),--define "date $(DATE)") +NVR := $(shell rpmquery $(RPMFLAGS) --specfile SPECS/$(notdir $(SPEC)).in 2>/dev/null | head -1) +ARCH := $(shell rpmquery $(RPMFLAGS) --queryformat '%{ARCH}\n' --specfile SPECS/$(notdir $(SPEC)).in 2>/dev/null | head -1) all: RPMS/$(ARCH)/$(NVR).$(ARCH).rpm SRPMS/$(NVR).src.rpm diff --git a/Rules.mk b/Rules.mk index 5c3ceb61..8f4f7e12 100644 --- a/Rules.mk +++ b/Rules.mk @@ -32,7 +32,7 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# $Id: Makerules,v 1.5 2004/04/09 19:37:19 alk-pl_rpm Exp $ +# $Id: Makerules,v 1.6 2004/04/12 19:56:02 mlh-pl_rpm Exp $ # # Base cvsps and rpmbuild in the current directory @@ -163,8 +163,9 @@ endif # Build # -NVR := $(shell rpmquery $(RPMFLAGS) $(if $(DATE),--define "date $(DATE)") --specfile SPECS/$(notdir $(SPEC)).in 2>/dev/null | head -1) -ARCH := $(shell rpm $(RPMFLAGS) --showrc | sed -ne 's/^build arch[ ]*:[ ]*\(.*\)/\1/p') +RPMFLAGS += $(if $(DATE),--define "date $(DATE)") +NVR := $(shell rpmquery $(RPMFLAGS) --specfile SPECS/$(notdir $(SPEC)).in 2>/dev/null | head -1) +ARCH := $(shell rpmquery $(RPMFLAGS) --queryformat '%{ARCH}\n' --specfile SPECS/$(notdir $(SPEC)).in 2>/dev/null | head -1) all: RPMS/$(ARCH)/$(NVR).$(ARCH).rpm SRPMS/$(NVR).src.rpm -- 2.47.0