From a6d21eef2767d4274a69db77a881eecef12f10310695f494b63c82c7b06f7de9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 12 Apr 2023 12:56:43 +0000 Subject: [PATCH] - Depend also on /usr/bin/uncompress, not only /usr/bin/gzip; Requiring binaries instead of packages resolves the file conflict with busybox-gzip, which is used when building nginx opensuse images; dep chain was: nginx -> libdg3 -> libXpm4 -> gzip ==> conflict with busybox-gzip OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=23 --- libXpm.changes | 9 +++++++++ libXpm.spec | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/libXpm.changes b/libXpm.changes index 2bf91bd..0f1da05 100644 --- a/libXpm.changes +++ b/libXpm.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 12 11:59:25 UTC 2023 - Stefan Dirsch + +- Depend also on /usr/bin/uncompress, not only /usr/bin/gzip; + Requiring binaries instead of packages resolves the file + conflict with busybox-gzip, which is used when building nginx + opensuse images; dep chain was: nginx -> libdg3 -> libXpm4 -> gzip + ==> conflict with busybox-gzip + ------------------------------------------------------------------- Tue Apr 11 13:41:44 UTC 2023 - Fabian Vogt diff --git a/libXpm.spec b/libXpm.spec index 6d0fd8f..e05ff2b 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -51,8 +51,9 @@ storing/retrieving X pixmaps to/from files. %package -n %{lname} Summary: X Pixmap image file format library Group: System/Libraries -# Invokes 'gzip' at runtime. 'compress' is disabled by n_no-compress-on-sle.patch +# Invokes 'gzip' and 'uncompress' at runtime. 'compress' is disabled by n_no-compress-on-sle.patch Requires: /usr/bin/gzip +Requires: /usr/bin/uncompress %description -n %{lname} libXpm facilitates working with XPM (X PixMap), a format for