From 843a71a34f9938669b52981869e7fc6f0f9586fc9199dd200f7fae646d568510 Mon Sep 17 00:00:00 2001
From: Aaron Puchert <aaronpuchert@alice-dsl.net>
Date: Sun, 3 Mar 2024 23:47:45 +0000
Subject: [PATCH] - Use %patch -P N instead of deprecated %patchN.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm17?expand=0&rev=21
---
 llvm17.changes |  5 +++++
 llvm17.spec    | 50 +++++++++++++++++++++++++-------------------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/llvm17.changes b/llvm17.changes
index 82d93c7..6450fec 100644
--- a/llvm17.changes
+++ b/llvm17.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Mar  3 22:46:16 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Use %patch -P N instead of deprecated %patchN.
+
 -------------------------------------------------------------------
 Thu Jan 11 07:38:12 UTC 2024 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/llvm17.spec b/llvm17.spec
index 582e12b..70bcf86 100644
--- a/llvm17.spec
+++ b/llvm17.spec
@@ -422,7 +422,7 @@ BuildRequires:  python3-base
 BuildRequires:  pkgconfig(libedit)
 BuildRequires:  pkgconfig(zlib)
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 # llvm does not work on s390
 ExcludeArch:    s390
 %if %{with ffi}
@@ -512,7 +512,7 @@ Summary:        CLANG frontend for LLVM
 Group:          Development/Languages/C and C++
 URL:            https://clang.llvm.org/
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Recommends:     clang-tools
 Recommends:     gcc
 Recommends:     glibc-devel
@@ -716,7 +716,7 @@ Summary:        Linker for Clang/LLVM
 Group:          Development/Tools/Building
 URL:            https://lld.llvm.org/
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 
 %description -n lld%{_sonum}
 LLD is a linker from the LLVM project. That is a drop-in replacement for system linkers and runs much faster than them. It also provides features that are useful for toolchain developers.
@@ -748,7 +748,7 @@ BuildRequires:  pkgconfig(panel)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(zlib)
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Recommends:     python3-lldb%{_sonum}
 
 %description -n lldb%{_sonum}
@@ -826,24 +826,24 @@ This package contains the development files for Polly.
 
 %prep
 %setup -q -a 1 -a 2 -a 3 -a 4 -a 5 -a 6 -a 7 -a 8 -a 9 -a 10 -a 11 -a 12 -b 50 -b 51 -n llvm-%{_version}.src
-%patch0 -p2
-%patch1 -p2
-%patch5 -p1
-%patch13 -p1
-%patch14 -p1
-%patch16 -p2
-%patch17 -p2
-%patch20 -p1
-%patch21 -p1
-%patch24 -p1
-%patch25 -p2
+%patch -P 0 -p2
+%patch -P 1 -p2
+%patch -P 5 -p1
+%patch -P 13 -p1
+%patch -P 14 -p1
+%patch -P 16 -p2
+%patch -P 17 -p2
+%patch -P 20 -p1
+%patch -P 21 -p1
+%patch -P 24 -p1
+%patch -P 25 -p2
 
 pushd clang-%{_version}.src
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
-%patch9 -p2
+%patch -P 2 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 6 -p1
+%patch -P 9 -p2
 
 # We hardcode openSUSE
 rm unittests/Driver/DistroTest.cpp
@@ -854,15 +854,15 @@ rm test/Driver/nacl-direct.c
 popd
 
 pushd clang-tools-extra-%{_version}.src
-%patch10 -p2
+%patch -P 10 -p2
 popd
 
 pushd openmp-%{_version}.src
-%patch18 -p1
+%patch -P 18 -p1
 popd
 
 pushd lld-%{_version}.src
-%patch26 -p1
+%patch -P 26 -p1
 # lld got a compile-time dependency on libunwind that we don't want. (https://reviews.llvm.org/D86805)
 mkdir include/mach-o
 cp %{SOURCE13} include/mach-o
@@ -870,7 +870,7 @@ popd
 
 %if %{with lldb}
 pushd lldb-%{_version}.src
-%patch11 -p1
+%patch -P 11 -p1
 popd
 %endif
 
@@ -879,7 +879,7 @@ sed -i '/set(LLVM_COMMON_CMAKE_UTILS/ s/CMAKE_CURRENT_SOURCE_DIR/CMAKE_SOURCE_DI
     libcxx{,abi}-%{_version}.src/CMakeLists.txt
 sed -i '\"runtimes/cmake/Modules" s/CMAKE_CURRENT_SOURCE_DIR/CMAKE_SOURCE_DIR/g' libcxx{,abi}-%{_version}.src/CMakeLists.txt
 pushd libcxx-%{_version}.src
-%patch15 -p2
+%patch -P 15 -p2
 rm test/libcxx/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
 rm test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname.pass.cpp
 rm test/std/localization/locale.categories/category.time/locale.time.get.byname/get_monthname_wide.pass.cpp