rpms/fedora-release/OLPC-3 Makefile, 1.2, 1.3 fedora-release.spec, 1.69, 1.70 sources, 1.55, 1.56

C. Scott Ananian cscott at fedoraproject.org
Wed Sep 10 22:27:01 UTC 2008


Author: cscott

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

Modified Files:
	Makefile fedora-release.spec sources 
Log Message:
Update OLPC-3 fork to match f9 9-5.transition package.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	15 Oct 2007 18:44:51 -0000	1.2
+++ Makefile	10 Sep 2008 22:26:31 -0000	1.3
@@ -2,6 +2,7 @@
 # $Id$
 NAME := fedora-release
 SPECFILE = $(firstword $(wildcard *.spec))
+MOCKCFG = olpc-3-i386
 
 define find-makefile-common
 for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/fedora-release.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- fedora-release.spec	5 Sep 2008 22:26:53 -0000	1.69
+++ fedora-release.spec	10 Sep 2008 22:26:31 -0000	1.70
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	3.1
+Release:	5.transition.1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://laptop.org
@@ -54,6 +54,14 @@
 done
 ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora
 ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+# Do the same for newkey
+for arch in i386 x86_64 ppc ppc64
+  do
+  ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9-$arch
+  ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9-$arch
+done
+ln -s RPM-GPG-KEY-fedora-8-and-9-primary      RPM-GPG-KEY-fedora-8-and-9
+ln -s RPM-GPG-KEY-fedora-test-8-and-9-primary RPM-GPG-KEY-fedora-test-8-and-9
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -99,6 +107,12 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Sep 10 2008 C. Scott Ananian <cscott at laptop.org> - 9-5.transition.1
+- Update OLPC fork to 5.transition.
+
+* Mon Sep 08 2008 Warren Togami <wtogami at redhat.com> - 9-5.transition
+- transition state between old and new key
+
 * Fri Sep 05 2008 C. Scott Ananian <cscott at laptop.org> - 9-3.1
 - OLPC-local changes.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/OLPC-3/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources	20 Aug 2008 21:50:48 -0000	1.55
+++ sources	10 Sep 2008 22:26:31 -0000	1.56
@@ -1 +1 @@
-d3037f3460e9ce7288263cf8f2b90053  fedora-release-9.tar.gz
+06b8fcead95435ca7c8e2c10da0cba7d  fedora-release-9.tar.gz




More information about the fedora-extras-commits mailing list