rpms/fedora-release/devel fedora-release.spec,1.76,1.77

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26565

Modified Files:
	fedora-release.spec 
Log Message:
* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-1
- Update for F12-Alpha
- Replace F11 key with F12
- Drop old keys and inactive secondary arch keys
- Fix metalink urls to be https
- Drop the compose stuff



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- fedora-release.spec	24 Jul 2009 22:37:39 -0000	1.76
+++ fedora-release.spec	7 Aug 2009 23:14:22 -0000	1.77
@@ -3,8 +3,8 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	11.90
-Release:	2
+Version:	11.91
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -46,10 +46,8 @@ pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 for arch in i386 x86_64 ppc ppc64
   do
   ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test-$arch
 done
 ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -57,11 +55,6 @@ for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
-for file in compose/*; do
-  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
-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
@@ -87,14 +80,16 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 11.90-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Fri Aug 07 2009 Jesse Keating <jkeating at redhat.com> - 11.91-1
+- Update for F12-Alpha
+- Replace F11 key with F12
+- Drop old keys and inactive secondary arch keys
+- Fix metalink urls to be https
+- Drop the compose stuff
 
 * Mon Mar 30 2009 Jesse Keating <jkeating at redhat.com> - 11.90-1
 - Build for F12 collection