From a5a467a8ff8a8fc5e499f8840aad05d67487a43995702fc52bd301da350b36ec Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Mon, 26 Feb 2024 09:52:47 +0000 Subject: [PATCH] Accepting request 1150794 from home:ecsos:server - Adjustments patch macro for rpm 4.20. OBS-URL: https://build.opensuse.org/request/show/1150794 OBS-URL: https://build.opensuse.org/package/show/server:php:applications/phpMyAdmin?expand=0&rev=383 --- phpMyAdmin.changes | 5 +++++ phpMyAdmin.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/phpMyAdmin.changes b/phpMyAdmin.changes index 57123e4..052f1fd 100644 --- a/phpMyAdmin.changes +++ b/phpMyAdmin.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 26 09:45:34 UTC 2024 - ecsos + +- Adjustments patch macro for rpm 4.20. + ------------------------------------------------------------------- Fri May 5 07:46:47 UTC 2023 - diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec index 6bec4cf..221670a 100644 --- a/phpMyAdmin.spec +++ b/phpMyAdmin.spec @@ -118,8 +118,8 @@ This subpackage contains the Apache configuration files ## rpmlint: # wrong-file-end-of-line-encoding perl -p -i -e 's|\r\n|\n|' examples/config.manyhosts.inc.php -%patch0 -%patch1 +%patch -P 0 +%patch -P 1 # clean up find . -name .github -type d -prune -exec rm -r {} \;