From c9951192e71f9827a7f469e8baef2062a547d0a2 Mon Sep 17 00:00:00 2001 From: Dan HorĂ¡k Date: Feb 12 2024 17:09:57 +0000 Subject: modernize %patch macro usage --- diff --git a/ghdl.spec b/ghdl.spec index dc4ca76..79ed667 100644 --- a/ghdl.spec +++ b/ghdl.spec @@ -191,17 +191,17 @@ that tracks signal updates and schedules processes. %prep %setup -q -n gcc-%{gcc_version}-%{DATE} -a 100 -%patch0 -p0 -b .hack~ -%patch3 -p0 -b .libgomp-omp_h-multilib~ -%patch4 -p0 -b .libtool-no-rpath~ +%patch -P 0 -p0 -b .hack~ +%patch -P 3 -p0 -b .libgomp-omp_h-multilib~ +%patch -P 4 -p0 -b .libtool-no-rpath~ %if %{build_isl} -%patch5 -p0 -b .isl-dl~ -%patch6 -p0 -b .isl-dl2~ +%patch -P 5 -p0 -b .isl-dl~ +%patch -P 6 -p0 -b .isl-dl2~ %endif -%patch8 -p0 -b .no-add-needed~ -%patch9 -p0 -b .Wno-format-security~ +%patch -P 8 -p0 -b .no-add-needed~ +%patch -P 9 -p0 -b .Wno-format-security~ %if 0%{?fedora} >= 29 || 0%{?rhel} > 7 -%patch10 -p0 -b .rh1574936~ +%patch -P 10 -p0 -b .rh1574936~ %endif @@ -219,9 +219,9 @@ sed -i -e 's/Common Driver Var(flag_report_bug)/& Init(1)/' gcc/common.opt mv ghdl-%{ghdlcommit} ghdl pushd ghdl -%patch102 -p1 -b .gcc13~ -%patch104 -p1 -b .llvm~ -%patch106 -p1 -b .llvm16~ +%patch -P 102 -p1 -b .gcc13~ +%patch -P 104 -p1 -b .llvm~ +%patch -P 106 -p1 -b .llvm16~ popd # fix library and include path @@ -257,7 +257,7 @@ pushd ghdl make copy-sources popd -%patch110 -p0 -b .ppc64abort +%patch -P 110 -p0 -b .ppc64abort %build