diff --git a/.gitignore b/.gitignore index 06fb075..5635722 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mdadm-4.2-rc2.tar.xz +SOURCES/mdadm-4.2.tar.xz diff --git a/.mdadm.metadata b/.mdadm.metadata index f8a1efb..56ea749 100644 --- a/.mdadm.metadata +++ b/.mdadm.metadata @@ -1 +1 @@ -b6e99ec4b0c3953505dc2e6ef6e8f2a71a26207d SOURCES/mdadm-4.2-rc2.tar.xz +27f240cff200e00c28a486a028bcdb14f67f8790 SOURCES/mdadm-4.2.tar.xz diff --git a/SPECS/mdadm.spec b/SPECS/mdadm.spec index abd37d0..40e97c6 100644 --- a/SPECS/mdadm.spec +++ b/SPECS/mdadm.spec @@ -1,7 +1,10 @@ Name: mdadm Version: 4.2 -%define subversion rc2 -Release: rc2_1%{?dist}.2 +Release: 1%{?dist} +# If Release is not same with subversion, please define extraversion +# For example, release is rc3-1, subversion is rc3. +# extraversion should be rc3-1. This is used in Readme.c +%define extraversion 1 Summary: The mdadm program controls Linux md devices (software RAID arrays) URL: http://www.kernel.org/pub/linux/utils/raid/mdadm/ License: GPLv2+ @@ -41,7 +44,8 @@ file can be used to help with some common tasks. %autosetup -p1 -n %{name}-%{version}%{?subversion:_%{subversion}} %build -make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon +#If extraversion is defined, add EXTRAVERSION="%{extraversion}" +make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" EXTRAVERSION="%{extraversion}" mdadm mdmon %install make DESTDIR=%{buildroot} MANDIR=%{_mandir} BINDIR=%{_sbindir} SYSTEMD_DIR=%{_unitdir} UDEVDIR=/usr/lib/udev/ install install-systemd @@ -90,6 +94,10 @@ install -m644 %{SOURCE6} %{buildroot}/etc/libreport/events.d /etc/libreport/events.d/* %changelog +* Fri Dec 31 2021 Xiao Ni - 4.2 +- Update to upstream 4.2 +- Resolves rhbz#2026723, rhbz#2026532, rhbz#1995587 + * Fri Aug 13 2021 Xiao Ni - 4.2-rc2_1.2 - Fix gating test error and rpminspect error - Resolves rhbz#1870487, rhbz#1880529