diff --git a/.gitignore b/.gitignore index dab65ae..5635722 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/mdadm-4.2-rc3.tar.xz +SOURCES/mdadm-4.2.tar.xz diff --git a/.mdadm.metadata b/.mdadm.metadata index 03bf686..56ea749 100644 --- a/.mdadm.metadata +++ b/.mdadm.metadata @@ -1 +1 @@ -953a393e661e2bac6855f0a71e3630e0c358cb2f SOURCES/mdadm-4.2-rc3.tar.xz +27f240cff200e00c28a486a028bcdb14f67f8790 SOURCES/mdadm-4.2.tar.xz diff --git a/SPECS/mdadm.spec b/SPECS/mdadm.spec index 5637f44..629b994 100644 --- a/SPECS/mdadm.spec +++ b/SPECS/mdadm.spec @@ -1,9 +1,10 @@ Summary: The mdadm program controls Linux md devices (software RAID arrays) Name: mdadm Version: 4.2 -%define subversion rc3 -Release: rc3%{?dist} -Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}-%{subversion}.tar.xz +# extraversion is used to define rhel internal version +%define extraversion 1 +Release: %{extraversion}%{?dist} +Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}%{?subversion:-%{subversion}}.tar.xz Source1: mdmonitor.init Source2: raid-check Source3: mdadm.rules @@ -44,7 +45,7 @@ almost all functions without a configuration file, though a configuration file can be used to help with some common tasks. %prep -%setup -q -n %{name}-%{version}_%{subversion} +%setup -q -n %{name}-%{version}%{?subversion:_%{subversion}} %patch000 -p1 -b .disable @@ -53,7 +54,7 @@ file can be used to help with some common tasks. %patch201 -p1 -b .static %build -make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" mdadm mdmon +make %{?_smp_mflags} CXFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" SYSCONFDIR="%{_sysconfdir}" EXTRAVERSION="%{extraversion}" mdadm mdmon %install rm -rf %{buildroot} @@ -118,6 +119,10 @@ rm -rf %{buildroot} /usr/lib/mdadm/mdadm_env.sh %changelog +* Fri Feb 18 2022 Xiao Ni - 4.2 +- Update to 4.2 +- Resolves rhbz#2034809 + * Mon Nov 08 2021 Xiao Ni - 4.2-rc3 - Update to 4.2-rc3 - Resolves rhbz#1983019, rhbz#1995582, rhbz#1972032, rhbz#1885665