From 0fd80952acb8e7b7a4b229da975d19865ecad8bf Mon Sep 17 00:00:00 2001
From: Brian Stinson <bstinson@centosproject.org>
Date: Aug 10 2019 11:52:38 +0000
Subject: update some repo information


---

diff --git a/SOURCES/CentOS-Debuginfo.repo b/SOURCES/CentOS-Debuginfo.repo
index 82c7811..064d1eb 100644
--- a/SOURCES/CentOS-Debuginfo.repo
+++ b/SOURCES/CentOS-Debuginfo.repo
@@ -13,7 +13,7 @@
 #
 
 [base-debuginfo]
-name=CentOS - 8 - Debuginfo
+name=CentOS-$releasever - Debuginfo
 baseurl=http://debuginfo.centos.org/$releasever/$basearch/
 gpgcheck=1
 enabled=0
diff --git a/SOURCES/CentOS-Devel.repo b/SOURCES/CentOS-Devel.repo
deleted file mode 100644
index b85475c..0000000
--- a/SOURCES/CentOS-Devel.repo
+++ /dev/null
@@ -1,20 +0,0 @@
-# CentOS-Devel.repo
-#
-# The mirror system uses the connecting IP address of the client and the
-# update status of each mirror to pick mirrors that are updated to and
-# geographically close to the client.  You should use this for CentOS updates
-# unless you are manually picking other mirrors.
-#
-# If the mirrorlist= does not work for you, as a fall back you can try the
-# remarked out baseurl= line instead.
-#
-#
-
-[Devel]
-name=CentOS-$releasever - Devel
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=Devel&infra=$infra
-#baseurl=http://mirror.centos.org/$contentdir/$releasever/Devel/$basearch/os/
-gpgcheck=1
-enabled=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
-
diff --git a/SOURCES/CentOS-Media.repo b/SOURCES/CentOS-Media.repo
index 34bd1d8..6e17550 100644
--- a/SOURCES/CentOS-Media.repo
+++ b/SOURCES/CentOS-Media.repo
@@ -11,12 +11,20 @@
 #
 #  yum --disablerepo=\* --enablerepo=c8-media [command]
 
-[c8-media]
-name=CentOS-$releasever - Media
-baseurl=file:///media/CentOS/
-        file:///media/cdrom/
-        file:///media/cdrecorder/
+[c8-media-BaseOS]
+name=CentOS-BaseOS-$releasever - Media
+baseurl=file:///media/CentOS/BaseOS
+        file:///media/cdrom/BaseOS
+        file:///media/cdrecorder/BaseOS
 gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 
+[c8-media-AppStream]
+name=CentOS-AppStream-$releasever - Media
+baseurl=file:///media/CentOS/AppStream
+        file:///media/cdrom/AppStream
+        file:///media/cdrecorder/AppStream
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/SOURCES/CentOS-PowerTools.repo b/SOURCES/CentOS-PowerTools.repo
new file mode 100644
index 0000000..79dde5f
--- /dev/null
+++ b/SOURCES/CentOS-PowerTools.repo
@@ -0,0 +1,20 @@
+# CentOS-PowerTools.repo
+#
+# The mirror system uses the connecting IP address of the client and the
+# update status of each mirror to pick mirrors that are updated to and
+# geographically close to the client.  You should use this for CentOS updates
+# unless you are manually picking other mirrors.
+#
+# If the mirrorlist= does not work for you, as a fall back you can try the
+# remarked out baseurl= line instead.
+#
+#
+
+[PowerTools]
+name=CentOS-$releasever - PowerTools
+mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=PowerTools&infra=$infra
+#baseurl=http://mirror.centos.org/$contentdir/$releasever/Devel/$basearch/os/
+gpgcheck=1
+enabled=0
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
diff --git a/SOURCES/CentOS-fasttrack.repo b/SOURCES/CentOS-fasttrack.repo
index dc51bcf..d0ecb22 100644
--- a/SOURCES/CentOS-fasttrack.repo
+++ b/SOURCES/CentOS-fasttrack.repo
@@ -1,7 +1,7 @@
 #CentOS-fasttrack.repo
 
 [fasttrack]
-name=CentOS - 8 - fasttrack
+name=CentOS-$releasever - fasttrack
 mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=fasttrack&infra=$infra
 #baseurl=http://mirror.centos.org/$contentdir/$releasever/fasttrack/$basearch/
 gpgcheck=1
diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec
index 7ead8e8..8b4bc03 100644
--- a/SPECS/centos-release.spec
+++ b/SPECS/centos-release.spec
@@ -27,7 +27,7 @@
 
 Name:           centos-release
 Version:        %{upstream_rel}
-Release:        %{centos_rel}.0.6%{?dist}
+Release:        %{centos_rel}.0.7%{?dist}
 Summary:        %{product_family} release file
 Group:          System Environment/Base
 License:        GPLv2
@@ -70,7 +70,7 @@ Source305:      CentOS-Media.repo
 Source306:      CentOS-Sources.repo
 Source307:      CentOS-Vault.repo
 Source308:      CentOS-AppStream.repo
-Source309:      CentOS-Devel.repo
+Source309:      CentOS-PowerTools.repo
 Source310:      CentOS-centosplus.repo
 
 %ifarch %{arm}
@@ -219,6 +219,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Sat Aug 10 2019 Brian Stinson <bstinson@centosproject.org> 8-0.el7
+- Update Debuginfo and fasttrack to use releasever
+- Fix CentOS-media.repo to include appstream
 * Wed May  8 2019 Pablo Greco <pablo@fliagreco.com.ar> 8-0.el7
 - Initial setup for CentOS-8