[yum-cvs] /yum-utils yum-utils.spec, 1.28.2.9, 1.28.2.10 Makefile, 1.10.2.1, 1.10.2.2

[Tim Lauridsen]

Update of /home/groups/yum/cvs//yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv30242

Modified Files:
      Tag: yum-utils-1_0_X
	yum-utils.spec Makefile 
Log Message:
- Made 'make release' work with %{?dist} tag in spec.
- 'make ChangeLog' will follow CVS HEAD.
- Added 'archive' dependency to 'make srpm'
- Added %{?dist} to spec file again.


Index: yum-utils.spec
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/yum-utils.spec,v
retrieving revision 1.28.2.9
retrieving revision 1.28.2.10
diff -u -r1.28.2.9 -r1.28.2.10
--- yum-utils.spec	19 Feb 2007 07:57:44 -0000	1.28.2.9
+++ yum-utils.spec	19 Feb 2007 10:00:11 -0000	1.28.2.10
@@ -1,7 +1,7 @@
 Summary: Utilities based around the yum package manager
 Name: yum-utils
 Version: 1.0.3
-Release: 1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://linux.duke.edu/yum/download/yum-utils/%{name}-%{version}.tar.gz
@@ -243,6 +243,9 @@
 
 %changelog
 * Mon Feb 19 2007 Tim Lauridsen <tla at rasmil.dk>
+- Added %%{?dist} tag again
+
+* Mon Feb 19 2007 Tim Lauridsen <tla at rasmil.dk>
 - mark it as 1.0.3
 - Removed %%{?dist} tag
 

Index: Makefile
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/Makefile,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- Makefile	19 Feb 2007 08:11:05 -0000	1.10.2.1
+++ Makefile	19 Feb 2007 10:00:11 -0000	1.10.2.2
@@ -30,8 +30,9 @@
 	@rm -rf /tmp/${PKGNAME}-$(VERSION)	
 	@echo "The archive is in ${PKGNAME}-$(VERSION).tar.gz"
 	
-srpm:
-	rpmbuild -ts ${PKGNAME}-${VERSION}.tar.gz
+srpm: archive
+	rm -f ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-*.src.rpm
+	rpmbuild -ts  ${PKGNAME}-${VERSION}.tar.gz
 
 release:
 	@cvs commit -m "bumped yum-utils version to $(VERSION)"
@@ -42,7 +43,7 @@
 	
 upload: archive srpm
 	@scp ${PKGNAME}-${VERSION}.tar.gz $(WEBHOST):$(WEBPATH)/
-	@scp ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-${RELEASE}.src.rpm $(WEBHOST):$(WEBPATH)/	
+	@scp ~/rpmbuild/SRPMS/${PKGNAME}-${VERSION}-*.src.rpm $(WEBHOST):$(WEBPATH)/	
 	@rm -rf ${PKGNAME}-${VERSION}.tar.gz
 	
 ChangeLog: FORCE