From 884d61956e1cffbb79e45a7b984e2ed9581aeb550b3cf65bc1602be56533829f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Wed, 9 Aug 2023 16:57:40 +0000 Subject: [PATCH] [info=6b182c54ce80fc30660e81d346d6dd16] OBS-URL: https://build.opensuse.org/package/show/devel:BCI:Tumbleweed/minimal-image?expand=0&rev=41 --- config.sh | 7 +++++++ minimal-image.changes | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/config.sh b/config.sh index 3f2b8b5..55b5717 100644 --- a/config.sh +++ b/config.sh @@ -17,6 +17,13 @@ if command -v rpm > /dev/null; then fi +#========================================== +# Remove compat-usrmerge-tools if installed +#------------------------------------------ +if rpm -q compat-usrmerge-tools; then + rpm -e compat-usrmerge-tools +fi + #======================================= # Clean up after zypper if it is present diff --git a/minimal-image.changes b/minimal-image.changes index c5b8b69..f2bea4a 100644 --- a/minimal-image.changes +++ b/minimal-image.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Aug 9 14:54:19 UTC 2023 - Dirk Mueller + +- Remove unnecessary usrmerge compat package + ------------------------------------------------------------------- Wed Jul 12 12:52:48 UTC 2023 - Dirk Mueller