From 5ce462d36843c8325495071828d7ebfb8336c460 Mon Sep 17 00:00:00 2001
From: sopwith <sopwith>
Date: May 18 2005 20:58:49 +0000
Subject: update gpgkey stuff


---

diff --git a/RPM-GPG-KEY-fedora-extras b/RPM-GPG-KEY-fedora-extras
new file mode 100644
index 0000000..e89f164
--- /dev/null
+++ b/RPM-GPG-KEY-fedora-extras
@@ -0,0 +1,35 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.0.7 (GNU/Linux)
+
+mQGiBEG+vu8RBACyH3cUSp+DXbyIvZ075bGDhjhRCf8m44UW2cCQdO/45CJBkRnC
+AA6SHthCrXCVKIuuo1jSwy8kMXt1P/7IpF6Tc8ZMzcHKTyNetuuD/A7oavgnrJNb
+QVTScqbD6VrvjUAPpDz5TMPqMMFYwylp+ySKMQpoPOYoqdNE3XwnA5vOywCg44+S
+KDWIV0j5xCeIAoa47VmgF2cEAK/FIZRkbb7+i2Fob1mxKsnuLN/xx67aBpU2w7HO
+scVnkke08lRestDVk/6xb+lrq+gVLdNBfAANBrOcwRv2heu+Zu3PZGuC166/JWFM
+kx5a9TkI0zQAw72LqKeX4VDBRz5fUoIs/C+3aGc5Mh+h8fZYjJGf0kr/90rnd/0e
+WqsBA/9ONArdHN44aICt7xku/t98p9Da04A7kRYTHlLrBk5i0U4JJXKei7ZAzNi4
+Or//8ATepQdsBMCJVx1Ss/vJKxupLG9Mw43nbNuA5SmOSPnAoyglYadKyaUXBbVj
+mkqf9ZkjOMfD5u9PEWMWMq3f8uf05qxsrBDeiyc7Fk0jBYTvnrQ4RmVkb3JhIFBy
+ZSBFeHRyYXMgUmVsZWFzZSA8cHJlLWV4dHJhc0BmZWRvcmFwcm9qZWN0Lm9yZz6I
+XgQTEQIAHgUCQb6+7wIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCC7ZUEGscM
+5uAMAKC+XaPSCYIpdcmJYEe9rNxYMz/hLwCeOyBYUYA2L0WnbfXuNafRqwta/s2I
+RgQSEQIABgUCQgD+/AAKCRC0QmnQTypv0lVYAJoCLolPSuAj873GbV2+m3Bj6sS/
+UACeNcDmIWeruRld83uSQcx4xJyEOUa0KUZlZG9yYSBQcm9qZWN0IDxmZWRvcmEt
+ZXh0cmFzQHJlZGhhdC5jb20+iF4EExECAB4FAkIAeFQCGwMGCwkIBwMCAxUCAwMW
+AgECHgECF4AACgkQgu2VBBrHDOYu8wCffLm57mvcYApV7eqvHXr29gNAbLwAoJVq
+JWvgBIvg8/4MiqwKAQ1MDkIUiEYEEhECAAYFAkIA/wQACgkQtEJp0E8qb9LQJACf
+c0LteS513+5O6erQO7RBUxC/NI4AniDHK+Ogf5l5Gs2ciwD+WApsZ4mPtDBGZWRv
+cmEgUHJvamVjdCA8ZmVkb3JhLWV4dHJhc0BmZWRvcmFwcm9qZWN0Lm9yZz6IXgQT
+EQIAHgUCQgB4iQIbAwYLCQgHAwIDFQIDAxYCAQIeAQIXgAAKCRCC7ZUEGscM5gZ7
+AJ9n8CYN6nvMqxCbQQZwvs7e/J4//QCeM3nDwC5EfEbEtOHPIYAqTf3IQZaIRgQS
+EQIABgUCQgD/BAAKCRC0QmnQTypv0qKuAJ0cnqk9BbbblRSBbn72bK/BAquzywCe
+M7S0C6rfrYlfOjQHQdVB5GitT9u5AQ0EQb6+8RAEAJmsZ5apOFz0Fj6RwX0D+nOU
+Atdzd3zpTNzu4j8+L750ePutjuwizEmCxKycchuG+gGasLmdxY+xk5AUB7gLt4ms
+eKsWyHvQt+H4wG8jjOjHWXlaJkZaYQUxpVPd6/11hkoqpodJ9ckfoIJnpUJWDcd3
+HTW7jdq+ZtBXjQlwvh3HAAMHA/9g50+hqjn23d91SaFTkvaAySZYHEF/xm5sOV1X
+Z37XNFdl7JRl6BN7y59PE9Nk6qP4yHqH1G2YNDL3BmejChMF5GmEqluNdnvfFvwk
+yqPvE7qCv8BhktPqsnrpFmtfeDFI4vztD08oab9LdkDvQwLHBZpc+wCb4VJzOkaZ
+7e7VP4hJBBgRAgAJBQJBvr7xAhsMAAoJEILtlQQaxwzmxdYAn3X4X/ENC3V4yPDR
+7X6oVeIVr5fvAJ4n5vY10NpvYKV5arzKd8DSW2m5Bg==
+=N/fy
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-extras-devel.repo b/fedora-extras-devel.repo
index 418b6e9..04e4aae 100644
--- a/fedora-extras-devel.repo
+++ b/fedora-extras-devel.repo
@@ -3,5 +3,5 @@ name=Fedora Extras $releasever - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
 enabled=1
-gpgkey=http://download.fedora.redhat.com/pub/fedora/linux/extras/RPM-GPG-KEY-Fedora-Extras
+gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora-extras
 gpgcheck=0
diff --git a/fedora-release.spec b/fedora-release.spec
index cb2ede3..b2e2dbc 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -1,5 +1,5 @@
-%define release_version 3.92
-%define release_name Pre-FC4
+%define release_version 4
+%define release_name FC4
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide
 %define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}}
@@ -53,6 +53,8 @@ for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
+ln -s fedora-release-%{version} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -84,3 +86,4 @@ fi
 /usr/share/firstboot/modules/eula.py
 /usr/share/eula/eula.en_US
 %{_defaultdocdir}/HTML
+%{_defaultdocdir}/fedora-release
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index 0047972..41d97ed 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -4,3 +4,4 @@ name=Fedora Core $releasever - $basearch - Test Updates
 mirrorlist=http://fedora.redhat.com/download/mirrors/updates-testing-fc$releasever
 enabled=0
 gpgcheck=1
+gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora-test
diff --git a/fedora-updates.repo b/fedora-updates.repo
index e1b2044..61e137b 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -4,3 +4,4 @@ name=Fedora Core $releasever - $basearch - Released Updates
 mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever
 enabled=0
 gpgcheck=1
+gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora
diff --git a/fedora.repo b/fedora.repo
index 71848cd..7be5f29 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -4,3 +4,4 @@ name=Fedora Core $releasever - $basearch - Base
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever
 enabled=0
 gpgcheck=1
+gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora