From 75c633adc25f89e3fc67f6240b4c3c7777353834 Mon Sep 17 00:00:00 2001
From: Johnny Hughes <johnny@centos.org>
Date: Jun 02 2020 18:43:27 +0000
Subject: update centos-release for 8.2


---

diff --git a/SOURCES/update-boot b/SOURCES/update-boot
deleted file mode 100755
index 8b4eba5..0000000
--- a/SOURCES/update-boot
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-echo "Starting with CentOS 7.5.1804, this script is obsoleted by grubby"
-exit 0
diff --git a/SPECS/centos-release.spec b/SPECS/centos-release.spec
index fe26fd7..abe3a1b 100644
--- a/SPECS/centos-release.spec
+++ b/SPECS/centos-release.spec
@@ -16,9 +16,9 @@
 %define base_release_version 8
 %define full_release_version 8
 %define dist_release_version 8
-%define upstream_rel_long 8.1-0
-%define upstream_rel 8.1
-%define centos_rel 1.1911
+%define upstream_rel_long 8.2-0
+%define upstream_rel 8.2
+%define centos_rel 2.2004
 #define beta Beta
 %define dist .el%{dist_release_version}
 
@@ -27,7 +27,7 @@
 
 Name:           centos-release
 Version:        %{upstream_rel}
-Release:        %{centos_rel}.0.9%{?dist}
+Release:        %{centos_rel}.0.1%{?dist}
 Summary:        %{product_family} release file
 Group:          System Environment/Base
 License:        GPLv2
@@ -37,7 +37,6 @@ License:        GPLv2
 %define pkg_name centos-userland-release
 %package -n %{pkg_name}
 Summary:        %{product_family} release file
-Requires:       extlinux-bootloader
 %endif
 Provides:       centos-release = %{version}-%{release}
 Provides:       centos-release(upstream) = %{upstream_rel}
@@ -50,7 +49,7 @@ Provides:       centos-release-eula
 Provides:       redhat-release-eula
 
 Requires:       centos-gpg-keys = %{version}-%{release}
-Requires:       centos-repos = %{version}-%{release}
+Requires:       centos-repos >= %{version}-%{release}
 
 Source1:        85-display-manager.preset
 Source2:        90-default.preset
@@ -58,7 +57,6 @@ Source3:        99-default-disable.preset
 Source10:       RPM-GPG-KEY-centosofficial
 Source11:       RPM-GPG-KEY-centostesting
 
-Source99:       update-boot
 Source100:      rootfs-expand
 
 Source200:      EULA
@@ -215,11 +213,9 @@ install -m 0644 %{SOURCE1} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 install -m 0644 %{SOURCE2} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 install -m 0644 %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/system-preset/
 
-%ifarch %{arm}
-# Install armhfp specific tools
-mkdir -p %{buildroot}/%{_bindir}/
-install -m 0755 %{SOURCE99} %{buildroot}%{_bindir}/
-install -m 0755 %{SOURCE100} %{buildroot}%{_bindir}/
+%ifarch %{arm} aarch64
+# Install armhfp/aarch64 specific tools
+install -D -m 0755 %{SOURCE100} %{buildroot}%{_bindir}/rootfs-expand
 %endif
 
 
@@ -243,8 +239,7 @@ rm -rf %{buildroot}
 %{_datadir}/centos-release/*
 %{_prefix}/lib/os-release
 %{_prefix}/lib/systemd/system-preset/*
-%ifarch %{arm}
-%attr(0755,root,root) %{_bindir}/update-boot
+%ifarch %{arm} aarch64
 %attr(0755,root,root) %{_bindir}/rootfs-expand
 %endif
 
@@ -256,6 +251,12 @@ rm -rf %{buildroot}
 /etc/pki/rpm-gpg/
 
 %changelog
+* Fri May 15 2020 Pablo Greco <pgreco@centosproject.org> - 8-2.0.1
+- Relax dependency for centos-repos
+- Remove update_boot, it was never used in 8
+- Add rootfs_expand to aarch64
+- Bump release for 8.2
+
 * Thu Mar 12 2020 bstinson@centosproject.org - 8-1.0.9
 - Add the Devel repo to centos-release
 - Install os-release(5) content to /usr/lib and have /etc/os-release be a symlink (ngompa)pr#9