Attachment 884202 Details for Bug 1084111 – fix version/release marking

[patch] fix version/release marking

0002-1084111-client-version-string-incorrect.patch (text/plain), 1.80 KB, created by Greg Nichols on 2014-04-08 18:29:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2014-04-08 18:29:07 UTC

Size: 1.80 KB

patch

obsolete

>From dc781b5187e6fdb7dac77e1d6bd54dc7a1b28df3 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Tue, 8 Apr 2014 14:28:12 -0400
>Subject: [PATCH 2/2] 1084111 - client version string incorrect
>
>---
> Makefile | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/Makefile b/Makefile
>index a3e5da0..d1b91f5 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -47,7 +47,7 @@ mark-version:
> 	@echo "name = '$(HWCERT_NAME)'" >> $(HWCERT_VERSION_PY)
> 	@echo "respin = '$(RESPIN)'" >> $(HWCERT_VERSION_PY)
> 
>-install: mark-version install-server
>+install: install-server
> 	mkdir -p $(DESTDIR)/usr/share/hwcert
> 	mkdir -p $(DESTDIR)/var/hwcert
> 	mkdir -p $(DESTDIR)/var/hwcert/docs
>@@ -96,6 +96,7 @@ $(HWCERT_NAME)-info-$(HWCERT_VERSION_RELEASE).el$(HWCERT_RHEL_VERSION).tar.bz2:
> 	echo "*.pyo" >> $@
> 	echo "*.bz2" >> $@
> 	echo "hwcertSpec.*" >> $@
>+	echo "rpm" >> $@
> 
> $(HWCERT_NAME).spec: $(HWCERT_NAME).spec.in hwcertSpec.py mark-version
> 	./hwcertSpec.py --rhelVersion $(HWCERT_RHEL_VERSION)
>@@ -103,7 +104,7 @@ $(HWCERT_NAME).spec: $(HWCERT_NAME).spec.in hwcertSpec.py mark-version
> $(HWCERT_NAME)-info.spec: $(HWCERT_NAME)-info.spec.in hwcertSpec.py mark-version
> 	./hwcertSpec.py --rhelVersion $(HWCERT_RHEL_VERSION)
> 
>-rpm-prep: $(HWCERT_NAME)-$(HWCERT_VERSION_RELEASE).el$(HWCERT_RHEL_VERSION).tar.bz2 $(HWCERT_NAME)-info-$(HWCERT_VERSION_RELEASE).el$(HWCERT_RHEL_VERSION).tar.bz2 hwcert-client.spec $(HWCERT_NAME)-info.spec
>+rpm-prep:  mark-version $(HWCERT_NAME)-$(HWCERT_VERSION_RELEASE).el$(HWCERT_RHEL_VERSION).tar.bz2 $(HWCERT_NAME)-info-$(HWCERT_VERSION_RELEASE).el$(HWCERT_RHEL_VERSION).tar.bz2 hwcert-client.spec $(HWCERT_NAME)-info.spec
> 	rm -rf rpm
> 	mkdir -p rpm/{BUILD,RPMS,SRPMS,SOURCES,SPECS}
> 	cp $(HWCERT_NAME)-$(HWCERT_VERSION_RELEASE).el$(HWCERT_RHEL_VERSION).tar.bz2 rpm/SOURCES/
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1084111: 884202