| |
@@ -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 @@
|
| |
%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: 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 @@
|
| |
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 %{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 @@
|
| |
%{_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 @@
|
| |
/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
|
| |