[yum-git] 3 commits - Makefile

[Tim Lauridsen]

 Makefile |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit d00f7fa385d96bb0190c169b1c4a8f3b4fdf430a
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Aug 27 19:39:54 2008 +0200

    Make the uploaded srpm have the right name

diff --git a/Makefile b/Makefile
index 29387fc..eb5cfd3 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ PKGNAME = yum-utils
 UTILS = package-cleanup debuginfo-install repoclosure repomanage repoquery repo-graph repo-rss yumdownloader yum-builddep repotrack reposync repodiff yum-debug-dump verifytree yum-groups-manager
 UTILSROOT = yum-complete-transaction 
 VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
-RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec | awk -F% '{print $$1}')
+RELEASE=$(shell awk -F%: '/Release:/ { print $$2 }' ${PKGNAME}.spec ')
+SRPM_RELEASE=$(shell awk '/Release:/ { split($$2,a,"%"); print a[1] }')
+SRPM_FILE = ${PKGNAME}-${VERSION}-${SRPM_RELEASE}.src.rpm
 WEBHOST = login.dulug.duke.edu
 WEBPATH = /home/groups/yum/web/download/yum-utils/
 
@@ -36,7 +38,6 @@ archive:
 	@echo "The archive is in ${PKGNAME}-$(VERSION).tar.gz"
 	
 srpm: archive
-NMPATH=$(DESTDIR)/etc/NetworkManager/dispatcher.d
 	rm -f ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-*.src.rpm
 	rpmbuild -ts  ${PKGNAME}-${VERSION}.tar.gz
 
@@ -74,7 +75,7 @@ test-cleanup:
 
 upload: archive srpm
 	@scp ${PKGNAME}-${VERSION}.tar.gz $(WEBHOST):$(WEBPATH)/
-	@scp ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-*.src.rpm $(WEBHOST):$(WEBPATH)/	
+	@scp ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-*.src.rpm $(WEBHOST):$(WEBPATH)/${SRPM_FILE}
 	@rm -rf ${PKGNAME}-${VERSION}.tar.gz
 	
 ChangeLog: FORCE
commit 42c52dc5d790ed1ceb5ffcc2aaa64d9603d28fb3
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Aug 27 16:15:13 2008 +0200

    strip the %{dist} from release

diff --git a/Makefile b/Makefile
index 273c68d..29387fc 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ PKGNAME = yum-utils
 UTILS = package-cleanup debuginfo-install repoclosure repomanage repoquery repo-graph repo-rss yumdownloader yum-builddep repotrack reposync repodiff yum-debug-dump verifytree yum-groups-manager
 UTILSROOT = yum-complete-transaction 
 VERSION=$(shell awk '/Version:/ { print $$2 }' ${PKGNAME}.spec)
-RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec)
+RELEASE=$(shell awk '/Release:/ { print $$2 }' ${PKGNAME}.spec | awk -F% '{print $$1}')
 WEBHOST = login.dulug.duke.edu
 WEBPATH = /home/groups/yum/web/download/yum-utils/
 
@@ -36,6 +36,7 @@ archive:
 	@echo "The archive is in ${PKGNAME}-$(VERSION).tar.gz"
 	
 srpm: archive
+NMPATH=$(DESTDIR)/etc/NetworkManager/dispatcher.d
 	rm -f ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-*.src.rpm
 	rpmbuild -ts  ${PKGNAME}-${VERSION}.tar.gz
 
commit ae2de31a63be921fa5e5888b8cd990c64fdd4608
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Wed Aug 27 15:44:35 2008 +0200

    Added  to make the build work

diff --git a/Makefile b/Makefile
index 593786d..273c68d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ WEBHOST = login.dulug.duke.edu
 WEBPATH = /home/groups/yum/web/download/yum-utils/
 
 NMPROG=yum-NetworkManager-dispatcher
-NMPATH=/etc/NetworkManager/dispatcher.d
+NMPATH=$(DESTDIR)/etc/NetworkManager/dispatcher.d
 
 clean:
 	rm -f *.pyc *.pyo *~