rpms/fedora-release/devel fedora-release.spec, 1.54, 1.55 sources, 1.42, 1.43

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31621

Modified Files:
	fedora-release.spec sources 
Log Message:
* 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



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- fedora-release.spec	30 May 2007 14:17:31 -0000	1.54
+++ fedora-release.spec	19 Jun 2007 19:58:05 -0000	1.55
@@ -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,16 @@
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+# Set up the dist tag macros
+install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
+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 +69,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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources	30 May 2007 14:17:31 -0000	1.42
+++ sources	19 Jun 2007 19:58:05 -0000	1.43
@@ -1 +1 @@
-c3c040e68f3fe805246e2dd252d97df8  fedora-release-7.89.tar.gz
+7d8bbbd07871c7634e5c383cbc37d46a  fedora-release-7.89.tar.gz