From bf2a5ebf8bf42edf861d915476ec86db366c17ca Mon Sep 17 00:00:00 2001 From: Xiao Ni Date: Fri, 31 Dec 2021 13:21:58 +0800 Subject: [PATCH] Update to latest upstream 4.2 It also adds some comments in spec file to describe we should use EXTRAVERSION against make command when we have a subversion. Resolves: rhbz#2026723, rhbz#2026532, rhbz#1995587 Signed-off-by: Xiao Ni --- mdadm.spec | 14 +++++++++++--- sources | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/mdadm.spec b/mdadm.spec index abd37d0..40e97c6 100644 --- a/mdadm.spec +++ b/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 diff --git a/sources b/sources index a190524..6b62e85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mdadm-4.2-rc2.tar.xz) = 09a3657284c7f98892f5be663d5e034252ff319d8ff1d235597efc373c156188d450e12f64a9a0fb9266b00035c1602133e487ce1961db1a12db05f7f9829249 +SHA512 (mdadm-4.2.tar.xz) = 57897a2b7fb8b0b88bece50501099872bb45ddb076cfc323d563588096d2b66b1ecba3724534943f651ace2bfe591482570700616500dc3398552e4f9ff0c37d