diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index 400befe..0668ec3 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 23 17:02:18 UTC 2024 - Dominique Leuenberger + +- Properly comment out %patch lines: '#' still expands the macro, which + makes build fail with rpm 4.20. Use %dnl instead. + ------------------------------------------------------------------- Wed Dec 18 10:32:34 UTC 2024 - Stefan Dirsch diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 7b46b38..f62c3b9 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -368,21 +368,21 @@ sh %{SOURCE92} --verify . %{SOURCE91} %patch -P 12 -p1 # %patch -P 100 -p1 -#%patch -P 101 -p1 +%dnl %patch -P 101 -p1 %patch -P 104 -p1 %patch -P 117 -p1 %patch -P 160 -p1 %patch -P 208 -p1 %patch -P 209 -p1 ### not applicable anymore -#%patch -P 210 -p1 +%dnl %patch -P 210 -p1 %patch -P 215 -p1 ### disabled for now -#%patch -P 1162 -p1 +%dnl %patch -P 1162 -p1 ### disabled for now -#%patch -P 1211 -p1 +%dnl %patch -P 1211 -p1 ### patch222 might not be applicable anymore -#%patch -P 1222 -p1 +%dnl %patch -P 1222 -p1 %patch -P 1401 -p1 %patch -P 1503 -p1 %patch -P 1900 -p1