From 632cda5d8da10ee8bc611839e55bb7c2d3ae1d3b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 16 Jan 2023 11:07:33 +0200 Subject: Convert most of our examples to use a modern %patch syntax In order to properly deprecate the syntax, we need to move ourselves off it first... (cherry picked from commit 6edbb02d30a862be990c634d859ac80c6239f3f8) --- docs/manual/autosetup.md | 8 ++++---- tests/data/SPECS/hello-g3.spec | 2 +- tests/data/SPECS/hello-r2.spec | 2 +- tests/data/SPECS/hello.spec | 2 +- tests/data/SPECS/hello2.spec | 2 +- tests/data/SPECS/hello2cp.spec | 2 +- tests/data/SPECS/hello2ln.spec | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/manual/autosetup.md b/docs/manual/autosetup.md index d0011464a..50f06c795 100644 --- a/docs/manual/autosetup.md +++ b/docs/manual/autosetup.md @@ -13,11 +13,11 @@ manually specify each patch to be applied, eg ``` %prep %setup -q -%patch0 -%patch1 -%patch2 +%patch 0 +%patch 1 +%patch 2 ... -%patch149 +%patch 149 ``` This can get rather tedious when the number of patches is large. The new diff --git a/tests/data/SPECS/hello-g3.spec b/tests/data/SPECS/hello-g3.spec index bb5d5b413..40c876b80 100644 --- a/tests/data/SPECS/hello-g3.spec +++ b/tests/data/SPECS/hello-g3.spec @@ -12,7 +12,7 @@ Simple rpm demonstration. %prep %setup -q -n hello-1.0 -%patch0 -p1 -b .modernize +%patch -p1 -b .modernize 0 %build diff --git a/tests/data/SPECS/hello-r2.spec b/tests/data/SPECS/hello-r2.spec index 5104dad10..fe60be158 100644 --- a/tests/data/SPECS/hello-r2.spec +++ b/tests/data/SPECS/hello-r2.spec @@ -15,7 +15,7 @@ Simple rpm demonstration. %prep %setup -q -%patch0 -p1 -b .modernize +%patch -p1 -b .modernize 0 %build make diff --git a/tests/data/SPECS/hello.spec b/tests/data/SPECS/hello.spec index 2304a7cb4..120aa8d22 100644 --- a/tests/data/SPECS/hello.spec +++ b/tests/data/SPECS/hello.spec @@ -22,7 +22,7 @@ Simple rpm demonstration. %prep %setup -q -%patch0 -p1 -b .modernize +%patch -p1 -b .modernize 0 %build make diff --git a/tests/data/SPECS/hello2.spec b/tests/data/SPECS/hello2.spec index b0c8b5459..aed3add90 100644 --- a/tests/data/SPECS/hello2.spec +++ b/tests/data/SPECS/hello2.spec @@ -15,7 +15,7 @@ Simple rpm demonstration. %prep %setup -q -n hello-1.0 -%patch0 -p1 -b .modernize +%patch -p1 -b .modernize -P0 %build make CFLAGS="-g -O1" diff --git a/tests/data/SPECS/hello2cp.spec b/tests/data/SPECS/hello2cp.spec index 2a9cd35c4..0ca4c2900 100644 --- a/tests/data/SPECS/hello2cp.spec +++ b/tests/data/SPECS/hello2cp.spec @@ -15,7 +15,7 @@ Simple rpm demonstration. %prep %setup -q -n hello-1.0 -%patch0 -p1 -b .modernize +%patch -p1 -b .modernize 0 %build make CFLAGS="-g -O1" diff --git a/tests/data/SPECS/hello2ln.spec b/tests/data/SPECS/hello2ln.spec index 0377b389d..441a7c1f8 100644 --- a/tests/data/SPECS/hello2ln.spec +++ b/tests/data/SPECS/hello2ln.spec @@ -15,7 +15,7 @@ Simple rpm demonstration. %prep %setup -q -n hello-1.0 -%patch0 -p1 -b .modernize +%patch -p1 -b .modernize 0 %build make CFLAGS="-g -O1" -- cgit v1.2.1