From 4c4e1b41f7e6891e3e9d46589cdee112a20dee07 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Feb 10 2015 16:24:17 +0000
Subject: - Setup for f22 branch

- Drop anaconda sub package

---

diff --git a/RPM-GPG-KEY-fedora-21-primary b/RPM-GPG-KEY-fedora-21-primary
deleted file mode 100644
index 81916a1..0000000
--- a/RPM-GPG-KEY-fedora-21-primary
+++ /dev/null
@@ -1,29 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-mQINBFKEQVoBEADOb9mKZZtTIVRMMejO9dco+dsv6L2ZvnlidMVaudoD7pN9hl35
-xUZFwQxzATy2iCoFY92WU1zIKxCg9fa0gS9jGGl9rOI/1uQm+i/KxkzJCKW0CYpA
-QVNNYHewQa7JHuTYbaN+kWEBGG0RWJw6BN2NxR3zDkLT2tgcf0zBobeUMi6XwFg4
-jikJ/vi84MEX4Gky/OtVXuzk0fGnP7xYPYfBkfG5FbMj3UxbfAAn1Sr9PxIFdCxP
-c06h9kkO+gJPD7Cis1pNg9HWpssIEHIk0ZaL0sssMSpSsgP0f44UpKVCq0+JDJmM
-EEu2KfeV9r2dEiEude+Gg4U3rbUh2PTZpQKKwPyggQwk6nPHbrqrr9zBIH5iyYuU
-vdTVO7YrDqYK5o3WhqKYG19oNbtCziNuC9x8RLFkerr0amQjy1dZsofGYSLjZ8Er
-3PgtUMunH4Y7O6FbRljniqYoQl8GDMaxhptvrOY+NqRAQiRLzpT6BB3nZhO9iSk9
-Lvb9hwjMFsN5xh2wCxYV+XNjnMSO+LZisJimKhyMVhimcYK1P0sU49RcglmS2mhP
-OGb14pH+B94lMve/kQu4unnhKhtkPA0mOyeH8BGl63vvEbJtMzpMqbHvzr60h8PA
-H7EsAsYJZp4Xa+F1wBRBJ3xKaUTQ7r7mmpFsdgzlI2wjNgLbyEV4YSNVjwARAQAB
-tCZGZWRvcmEgKDIxKSA8ZmVkb3JhQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
-IgUCUoRBWgIbDwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQia1Oh5WkP1S+
-rQ//V5WOPjl0UjEgRYsjwm6LGZe8/P4muXdKX1OuRF+MLZxW1Pbr43zjvfY9tZlD
-v4QpI5uECX5To9phrOXI8ghFpI4aQbRe2enk4dksgdhzdBW0JgM3JRf8F+tPLKEF
-kB2/tGqi/irp+Hij/tiHwUZjx8qKGbF0r2bxAkSS5qkmalTs6PwcWwEN4a6sKPgw
-iVGL2VRM46YoNDORwH7HYeODbJtyJyX3NvcluNKf/D3OZFaNYH+nUISlaPAbC5HJ
-sVmZD9vm2E2ypErbZzrY3N8PRgHuIrDmO+LmksWteofpWZO84lyuvgYgXPy8Q3Ls
-+p0zfE5zv8EbX4WG+l1SF7hVdPC7UEPUuHmlm81Fi69tSvwO+N4PrDU094VHT+UQ
-rKmtSGDOfSx6FvrEqMakiEyBgKNwhsVJbi6/LXHMBImbSN3tOxSMBxGEi2cSn/KF
-LRukmMoEw4PHZK+gPpwsP1cTfxezs/aH/PMBaPUgg1qCu9uNNFmEs3d5LLSee9RM
-U+gwECX+D44vqJUAT7xM1A4yij3rPF2RegOmNhu5wg4zNSGKoVV8QsMOKrjIZHmG
-pFVvYFP4OxLEwh6OYZj9qfaw445ryqfcxSNzZ3m+VSwHuZ049v7u8fndZ8TREVXx
-hdjPHxjtaiJ1R0Zb4ZvycUcDLl2Xc1CRJAMVvFJcg1SNrGs=
-=xtMc
------END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-21-secondary b/RPM-GPG-KEY-fedora-21-secondary
deleted file mode 100644
index 6c21496..0000000
--- a/RPM-GPG-KEY-fedora-21-secondary
+++ /dev/null
@@ -1,62 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-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
-=/oDi
------END PGP PUBLIC KEY BLOCK-----
diff --git a/archmap b/archmap
index 2430f22..4a64253 100644
--- a/archmap
+++ b/archmap
@@ -1,6 +1,3 @@
-fedora-19-primary: i386 x86_64
-fedora-19-secondary: arm armhfp aarch64 ppc ppc64 s390 s390x
-
 fedora-20-primary: i386 x86_64 armhfp
 fedora-20-secondary: aarch64 ppc ppc64 s390 s390x
 
@@ -9,3 +6,6 @@ fedora-21-secondary: aarch64 ppc64 ppc64le s390 s390x
 
 fedora-22-primary: i386 x86_64 armhfp
 fedora-22-secondary: aarch64 ppc64 ppc64le s390 s390x
+
+fedora-23-primary: i386 x86_64 armhfp
+fedora-23-secondary: aarch64 ppc64 ppc64le s390 s390x
diff --git a/fedora-cloud.repo b/fedora-cloud.repo
deleted file mode 100644
index 4d77acf..0000000
--- a/fedora-cloud.repo
+++ /dev/null
@@ -1,21 +0,0 @@
-[fedora-cloud]
-name=Fedora Cloud $releasever - $basearch
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Cloud/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cloud-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-cloud-source]
-name=Fedora $releasever - Source
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Cloud/source/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-cloud-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/fedora-rawhide.repo b/fedora-rawhide.repo
index 6b61c41..be487b7 100644
--- a/fedora-rawhide.repo
+++ b/fedora-rawhide.repo
@@ -24,7 +24,7 @@ name=Fedora - Rawhide - Developmental packages for the next Fedora release
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/rawhide/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
-enabled=1
+enabled=0
 metadata_expire=6h
 gpgcheck=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/fedora-repos.spec b/fedora-repos.spec
index 9cbc1cd..27d7bbc 100644
--- a/fedora-repos.spec
+++ b/fedora-repos.spec
@@ -1,7 +1,7 @@
 Summary:        Fedora package repositories
 Name:           fedora-repos
 Version:        22
-Release:        0.2
+Release:        0.3
 License:        MIT
 Group:          System Environment/Base
 URL:            https://git.fedorahosted.org/cgit/fedora-repos.git/
@@ -9,23 +9,17 @@ URL:            https://git.fedorahosted.org/cgit/fedora-repos.git/
 Source:         %{name}-%{version}.tar.bz2
 Provides:       fedora-repos(%{version})
 Requires:       system-release(%{version})
-Requires:       fedora-repos-rawhide = %{version}-%{release}
+Obsoletes:      fedora-repos-rawhide < 22-0.3
+Obsoletes:      fedora-repos-anaconda < 22-0.3
 BuildArch:      noarch
 
 %description
 Fedora package repository files for yum and dnf along with gpg public keys
 
-%package anaconda
-Summary:        Fedora product repo definitions for anaconda
-Requires:       fedora-repos = %{version}-%{release}
-
-%description anaconda
-This package provides the product repo definitions for anaconda.
-
 %package rawhide
 Summary:        Rawhide repo definitions
 Requires:       fedora-repos = %{version}-%{release}
-Obsoletes:      fedora-release-rawhide <= 21-0.7
+Obsoletes:      fedora-release-rawhide <= 22-0.3
 
 %description rawhide
 This package provides the rawhide repo definitions.
@@ -73,17 +67,14 @@ done
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
-%files anaconda
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/fedora-cloud.repo
-%config(noreplace) /etc/yum.repos.d/fedora-server.repo
-%config(noreplace) /etc/yum.repos.d/fedora-workstation.repo
-
 %files rawhide
 %defattr(-,root,root,-)
 %config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
 
 %changelog
+* Tue Feb 10 2015 Peter Robinson <pbrobinson@fedoraproject.org> 22.0.3
+- Setup for f22 branch
+
 * Wed Sep 10 2014 Dennis Gilmore <dennis@ausil.us> 22-0.2
 - add repo files for the products
 
diff --git a/fedora-server.repo b/fedora-server.repo
deleted file mode 100644
index a5272c0..0000000
--- a/fedora-server.repo
+++ /dev/null
@@ -1,21 +0,0 @@
-[fedora-server]
-name=Fedora Server $releasever - $basearch
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Server/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-server-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-server-source]
-name=Fedora Server $releasever - Source
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Server/source/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-server-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/fedora-updates-testing.repo b/fedora-updates-testing.repo
index c99c037..824a921 100644
--- a/fedora-updates-testing.repo
+++ b/fedora-updates-testing.repo
@@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch - Test Updates
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/fedora-updates.repo b/fedora-updates.repo
index 1d9e18d..72ec146 100644
--- a/fedora-updates.repo
+++ b/fedora-updates.repo
@@ -3,7 +3,7 @@ name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=updates-released-f$releasever&arch=$basearch
-enabled=0
+enabled=1
 gpgcheck=1
 metadata_expire=6h
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
diff --git a/fedora-workstation.repo b/fedora-workstation.repo
deleted file mode 100644
index ec59bba..0000000
--- a/fedora-workstation.repo
+++ /dev/null
@@ -1,21 +0,0 @@
-[fedora-workstation]
-name=Fedora Workstation $releasever - $basearch
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Workstation/$basearch/os/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-workstation-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
-
-[fedora-workstation-source]
-name=Fedora $releasever - Source
-failovermethod=priority
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Workstation/source/SRPMS/
-metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-workstation-source-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
-skip_if_unavailable=False
diff --git a/fedora.repo b/fedora.repo
index 5c70ef2..bd0bcaa 100644
--- a/fedora.repo
+++ b/fedora.repo
@@ -3,9 +3,9 @@ name=Fedora $releasever - $basearch
 failovermethod=priority
 #baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 metalink=https://mirrors.fedoraproject.org/metalink?repo=fedora-$releasever&arch=$basearch
-enabled=0
-metadata_expire=7d
-gpgcheck=0
+enabled=1
+#metadata_expire=7d
+gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 skip_if_unavailable=False