From d49fe516526ba12aced56fed275110170dc4549a6725f281300bbb7644b76bfb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 1 Mar 2024 13:06:59 +0000 Subject: [PATCH] Accepting request 1151814 from home:dimstar:rpm4.20:d - Use %autosetup macro. Allows to eliminate the usage of deprecated PatchN. - Rebase 0001-remove-partitions-with-O_RDONLY.patch to apply -p1. OBS-URL: https://build.opensuse.org/request/show/1151814 OBS-URL: https://build.opensuse.org/package/show/Base:System/dmraid?expand=0&rev=66 --- 0001-remove-partitions-with-O_RDONLY.patch | 4 ++-- dmraid.changes | 7 +++++++ dmraid.spec | 12 +++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/0001-remove-partitions-with-O_RDONLY.patch b/0001-remove-partitions-with-O_RDONLY.patch index 4b0facc..741e87b 100644 --- a/0001-remove-partitions-with-O_RDONLY.patch +++ b/0001-remove-partitions-with-O_RDONLY.patch @@ -13,8 +13,8 @@ from systemd, which will reinstate all partitions just deleted. diff --git a/lib/device/partition.c b/lib/device/partition.c index 99e92f6a66cd..bcc8de819eb4 100644 ---- a/1.0.0.rc16/lib/device/partition.c -+++ b/1.0.0.rc16/lib/device/partition.c +--- a/lib/device/partition.c ++++ b/lib/device/partition.c @@ -22,8 +22,7 @@ _remove_subset_partitions(struct lib_context *lc, struct raid_set *rs) }; diff --git a/dmraid.changes b/dmraid.changes index 4b6e417..7504e15 100644 --- a/dmraid.changes +++ b/dmraid.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Feb 26 07:50:20 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + PatchN. +- Rebase 0001-remove-partitions-with-O_RDONLY.patch to apply -p1. + ------------------------------------------------------------------- Tue Dec 27 10:33:15 UTC 2022 - Ludwig Nussel diff --git a/dmraid.spec b/dmraid.spec index 3faafb2..7d76b6f 100644 --- a/dmraid.spec +++ b/dmraid.spec @@ -1,7 +1,7 @@ # # spec file for package dmraid # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -39,7 +39,7 @@ BuildRequires: zlib-devel Requires: aaa_base Requires: kpartx Requires(post): coreutils -Requires(postun):coreutils +Requires(postun): coreutils URL: http://people.redhat.com/~heinzm/sw/dmraid/src/ Summary: A Device-Mapper Software RAID Support Tool License: GPL-2.0-only @@ -94,13 +94,7 @@ dmraid uses libdevmapper and the device-mapper kernel runtime to create devices with respective mappings for the ATARAID sets discovered. %prep -%setup -n dmraid/%{src_version}/dmraid -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p2 +%autosetup -p1 -n dmraid/%{src_version}/dmraid cp %{SOURCE3} .