fedora-release fedora-release.spec,1.46,1.47

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31514

Modified Files:
	fedora-release.spec 
Log Message:
do dist tag here now


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- fedora-release.spec	30 May 2007 14:14:30 -0000	1.46
+++ fedora-release.spec	19 Jun 2007 19:55:30 -0000	1.47
@@ -1,9 +1,10 @@
 %define release_name Rawhide
+%define dist_version 8
 
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	7.89
-Release:	1
+Release:	2
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -46,6 +47,15 @@
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+# Set up the dist tag macros
+cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
+# dist macros.
+
+%%fedora		%{dist_version}
+%%dist		.fc%{dist_version}
+%%fc%{dist_version}		1
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -58,10 +68,14 @@
 %doc GPL 
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
+%config(noreplace) %attr(0644,root,root) /etc/rpm/macros.dist
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Tue Jun 19 2007 Jesse Keating <jkeating at redhat.com> - 7.89-2
+- Define the dist macros in this package since we define everyting else here
+
 * Wed May 30 2007 Jesse Keating <jkeating at redhat.com> - 7.89-1
 - And we're back to rawhide.  Re-enable devel repos