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

[Dennis Gilmore]

Author: ausil

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

Modified Files:
	fedora-release.spec 
Log Message:
bracnh for OLPC-4 based on F-10



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-4/fedora-release.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- fedora-release.spec	6 Nov 2008 20:04:21 -0000	1.71
+++ fedora-release.spec	11 Nov 2008 20:56:23 -0000	1.72
@@ -1,18 +1,19 @@
-%define release_name Cambridge
-%define dist_version 10
+%define release_name Joyride
+%define dist_version 4
 
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	10
-Release:	1
+Release:	1.1
 License:	GPLv2
 Group:		System Environment/Base
-URL:		http://fedoraproject.org
+URL:		http://laptop.org
 Source:		%{name}-%{version}.tar.gz
 Obsoletes:	redhat-release
 Provides:	redhat-release
 Provides:	system-release = %{version}-%{release}
-Requires:	fedora-release-notes >= 10
+#olpc doesnt need to have the release-notes installed
+#Requires:	fedora-release-notes >= 10
 # We require release notes to make sure that they don't get dropped during
 # upgrades, and just because we always want the release notes available
 # instead of explicitly asked for
@@ -31,8 +32,9 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc
-echo "Fedora release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
-echo "cpe://o:fedora_project:fedora:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe
+echo "9.1" > $RPM_BUILD_ROOT/etc/olpc-release                                     
+echo "OLPC release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
+echo "cpe://o:olpc_project:olpc:%{version}" > $RPM_BUILD_ROOT/etc/system-release-cpe 
 cp -p $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m (\l)" >> $RPM_BUILD_ROOT/etc/issue
 cp -p $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
@@ -66,9 +68,10 @@
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
 # dist macros.
 
-%%fedora		%{dist_version}
-%%dist		.fc%{dist_version}
-%%fc%{dist_version}		1
+%%fedora               10
+%%olpc                 %{dist_version}
+%%dist         .olpc%{dist_version}
+%%olpc%{dist_version}          1
 EOF
 
 %clean
@@ -77,6 +80,7 @@
 %files
 %defattr(-,root,root,-)
 %doc GPL 
+%config %attr(0644,root,root) /etc/olpc-release
 %config %attr(0644,root,root) /etc/fedora-release
 /etc/redhat-release
 /etc/system-release
@@ -90,6 +94,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Tue Nov 11 2008 Dennis Gilmore <dennis at ausil.us> - 10-1.1
+- branch off for OLPC-4 based on F-10
+
 * Fri Oct 31 2008 Jesse Keating <jkeating at redhat.com> - 10-1
 - Update for Fedora 10 release
 - Set name to Cambridge