rpms/fedora-release/OLPC-4 fedora-release.spec,1.72,1.73

[Daniel Drake]

Author: dsd

Update of /cvs/pkgs/rpms/fedora-release/OLPC-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29161

Modified Files:
	fedora-release.spec 
Log Message:
preserve F10 dist_version variable in spec file to fix symlinks to yum GPG certificates


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-4/fedora-release.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- fedora-release.spec	11 Nov 2008 20:56:23 -0000	1.72
+++ fedora-release.spec	6 Dec 2008 20:54:29 -0000	1.73
@@ -1,10 +1,11 @@
 %define release_name Joyride
-%define dist_version 4
+%define dist_version 10
+%define olpc_dist_version 4
 
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	10
-Release:	1.1
+Release:	1.2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://laptop.org
@@ -68,10 +69,10 @@
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
 # dist macros.
 
-%%fedora               10
-%%olpc                 %{dist_version}
-%%dist         .olpc%{dist_version}
-%%olpc%{dist_version}          1
+%%fedora               %{dist_version}
+%%olpc                 %{olpc_dist_version}
+%%dist         .olpc%{olpc_dist_version}
+%%olpc%{olpc_dist_version}          1
 EOF
 
 %clean
@@ -94,6 +95,10 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Sat Dec  6 2008 Daniel Drake <dsd at laptop.org> - 10-1.2
+- preserve F10 dist_version variable in spec file, needed for correct
+  /etc/pki/rpm-gpg symlinks to be created
+
 * Tue Nov 11 2008 Dennis Gilmore <dennis at ausil.us> - 10-1.1
 - branch off for OLPC-4 based on F-10