From baae0b6d36a6900dc784d11420bee1f9846e8a69 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 07:02:00 +0100 Subject: [PATCH] update to 4.2 [release 4.2-1mamba;Tue Jan 11 2022] --- README.md | 1 + mdadm.spec | 46 +++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index e41f2c3..5ff8d36 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ mdadm is a program that can be used to create, manage, and monitor Linux MD (Software RAID) devices. As such is provides similar functionality to the raidtools packages. The particular differences to raidtools is that mdadm is a single program, and it can perform (almost) all functions without a configuration file (that a config file can be used to help with some common tasks). + diff --git a/mdadm.spec b/mdadm.spec index 0245f4a..098f1a8 100644 --- a/mdadm.spec +++ b/mdadm.spec @@ -1,12 +1,12 @@ Name: mdadm -Version: 4.1 -Release: 2mamba +Version: 4.2 +Release: 1mamba Summary: A tool to manage MD devices aka Linux Software RAID Group: System/Kernel and Hardware Vendor: openmamba Distribution: openmamba -Packager: Stefano Cotta Ramusino -URL: http://neil.brown.name/blog/mdadm +Packager: Silvan Calarco +URL: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/ Source: http://www.kernel.org/pub/linux/utils/raid/mdadm/mdadm-%{version}.tar.xz Patch0: mdadm-3.3.1-gcc-4.9.patch Patch1: mdadm-3.4-i586-gcc-5.3.0.patch @@ -14,24 +14,17 @@ Patch2: mdadm-4.1-no-Werror.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: libudev-devel ## AUTOBUILDREQ-END -BuildRoot: %{_tmppath}/%{name}-%{version}-root %systemd_requires Provides: mdadm-static -Obsoletes: mdadm-static +Obsoletes: mdadm-static < 4.1 %description mdadm is a program that can be used to create, manage, and monitor Linux MD (Software RAID) devices. As such is provides similar functionality to the raidtools packages. The particular differences to raidtools is that mdadm is a single program, and it can perform (almost) all functions without a configuration file (that a config file can be used to help with some common tasks). -#%package static -#Group: System/Kernel and Hardware -#Summary: A tool to manage MD devices aka Linux Software RAID (static binary) -# -#%description static -#A tool to manage MD devices aka Linux Software RAID (static binary). - %debug_package %prep @@ -42,14 +35,16 @@ The particular differences to raidtools is that mdadm is a single program, and i %patch2 -p1 %build -%make +%make \ + SYSTEMD_DIR=%{_unitdir} -#%make mdadm.static +#% make mdadm.static %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall install-systemd \ - BINDIR=/sbin + SYSTEMD_DIR=%{_unitdir} \ + BINDIR=%{_sbindir} install -D -m 644 %{name}.conf-example \ %{buildroot}%{_sysconfdir}/%{name}.conf @@ -63,10 +58,16 @@ install -D -m 644 %{name}.conf-example \ %files %defattr(-,root,root) %config(noreplace,missingok)/%{_sysconfdir}/mdadm.conf -/sbin/%{name} -/sbin/mdmon +%{_sbindir}/%{name} +%{_sbindir}/mdmon %{_udevrulesdir}/*.rules -/lib/systemd/system-shutdown/mdadm.shutdown +%{_systemd_util_dir}/system-shutdown/mdadm.shutdown +%{_unitdir}/mdcheck_continue.service +%{_unitdir}/mdcheck_continue.timer +%{_unitdir}/mdcheck_start.service +%{_unitdir}/mdcheck_start.timer +%{_unitdir}/mdmonitor-oneshot.service +%{_unitdir}/mdmonitor-oneshot.timer %{_unitdir}/mdadm-grow-continue@.service %{_unitdir}/mdadm-last-resort@.service %{_unitdir}/mdadm-last-resort@.timer @@ -78,11 +79,10 @@ install -D -m 644 %{name}.conf-example \ %doc COPYING # ChangeLog README.initramfs TODO -#%files static -#%defattr(-,root,root) -#%{_sbindir}/%{name}.static - %changelog +* Tue Jan 11 2022 Silvan Calarco 4.2-1mamba +- update to 4.2 + * Tue Dec 08 2020 Silvan Calarco 4.1-2mamba - rebuilt with debug package