From eca73665360bbc2773dfab3eeacc6f82e9d1c6599817c13756a82ddf9ddb37ca Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 12 Apr 2023 11:58:08 +0000 Subject: [PATCH 1/6] Accepting request 1078595 from home:favogt:branches:X11:XOrg - Depend on /usr/bin/gzip, not gzip OBS-URL: https://build.opensuse.org/request/show/1078595 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=22 --- libXpm.changes | 5 +++++ libXpm.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libXpm.changes b/libXpm.changes index ce48e4b..2bf91bd 100644 --- a/libXpm.changes +++ b/libXpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 11 13:41:44 UTC 2023 - Fabian Vogt + +- Depend on /usr/bin/gzip, not gzip + ------------------------------------------------------------------- Mon Apr 3 20:27:28 UTC 2023 - Stefan Dirsch diff --git a/libXpm.spec b/libXpm.spec index e9542dc..6d0fd8f 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -31,9 +31,9 @@ Source1: https://xorg.freedesktop.org/releases/individual/lib/%{name}-%{v Source2: libXpm.keyring Source9: baselibs.conf Patch0: n_no-compress-on-sle.patch +BuildRequires: /usr/bin/gzip BuildRequires: autoconf BuildRequires: automake -BuildRequires: gzip BuildRequires: libtool BuildRequires: pkgconfig @@ -51,8 +51,8 @@ storing/retrieving X pixmaps to/from files. %package -n %{lname} Summary: X Pixmap image file format library Group: System/Libraries -# Invokes 'uncompress' and 'gzip' at runtim -Requires: gzip +# Invokes 'gzip' at runtime. 'compress' is disabled by n_no-compress-on-sle.patch +Requires: /usr/bin/gzip %description -n %{lname} libXpm facilitates working with XPM (X PixMap), a format for From a6d21eef2767d4274a69db77a881eecef12f10310695f494b63c82c7b06f7de9 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 12 Apr 2023 12:56:43 +0000 Subject: [PATCH 2/6] - 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 From 9d14d04f421df3694b8bb2bc6da1b1b4211c6d13291c7262b1c8ea39e4ceb583 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 12 Apr 2023 15:47:35 +0000 Subject: [PATCH 3/6] Accepting request 1078729 from home:favogt:xpmsimpler - Drop n_no-compress-on-sle.patch and set XPM_PATH_COMPRESS instead OBS-URL: https://build.opensuse.org/request/show/1078729 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=24 --- libXpm.changes | 5 +++++ libXpm.spec | 5 +++-- n_no-compress-on-sle.patch | 24 ------------------------ 3 files changed, 8 insertions(+), 26 deletions(-) delete mode 100644 n_no-compress-on-sle.patch diff --git a/libXpm.changes b/libXpm.changes index 0f1da05..0599982 100644 --- a/libXpm.changes +++ b/libXpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 12 13:39:54 UTC 2023 - Fabian Vogt + +- Drop n_no-compress-on-sle.patch and set XPM_PATH_COMPRESS instead + ------------------------------------------------------------------- Wed Apr 12 11:59:25 UTC 2023 - Stefan Dirsch diff --git a/libXpm.spec b/libXpm.spec index e05ff2b..2193067 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -30,7 +30,6 @@ Source: https://xorg.freedesktop.org/releases/individual/lib/%{name}-%{v Source1: https://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.xz.sig Source2: libXpm.keyring Source9: baselibs.conf -Patch0: n_no-compress-on-sle.patch BuildRequires: /usr/bin/gzip BuildRequires: autoconf BuildRequires: automake @@ -51,7 +50,8 @@ storing/retrieving X pixmaps to/from files. %package -n %{lname} Summary: X Pixmap image file format library Group: System/Libraries -# Invokes 'gzip' and 'uncompress' at runtime. 'compress' is disabled by n_no-compress-on-sle.patch +# Invokes 'gzip' and 'uncompress' at runtime. +# 'compress' is not available on SLE and unlikely used. Requires: /usr/bin/gzip Requires: /usr/bin/uncompress @@ -91,6 +91,7 @@ regard to its format. %build autoreconf -fi +export XPM_PATH_COMPRESS=%{_bindir}/compress %configure --disable-static %make_build diff --git a/n_no-compress-on-sle.patch b/n_no-compress-on-sle.patch deleted file mode 100644 index 29d2400..0000000 --- a/n_no-compress-on-sle.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u -r libXpm-3.5.15.orig/configure.ac libXpm-3.5.15/configure.ac ---- libXpm-3.5.15.orig/configure.ac 2023-04-03 22:10:42.223223000 +0200 -+++ libXpm-3.5.15/configure.ac 2023-04-03 22:11:35.264112000 +0200 -@@ -74,7 +74,6 @@ - if test x$OPEN_ZFILE = xno ; then - AC_DEFINE(NO_ZPIPE, 1, [Define to 1 to disable decompression via pipes]) - else -- XPM_PATH_PROG([XPM_PATH_COMPRESS], [compress]) - XPM_PATH_PROG([XPM_PATH_UNCOMPRESS], [uncompress]) - XPM_PATH_PROG([XPM_PATH_GZIP], [gzip]) - AC_CHECK_FUNCS([closefrom close_range], [break]) -diff -u -r libXpm-3.5.15.orig/src/WrFFrI.c libXpm-3.5.15/src/WrFFrI.c ---- libXpm-3.5.15.orig/src/WrFFrI.c 2023-04-03 22:10:41.615310000 +0200 -+++ libXpm-3.5.15/src/WrFFrI.c 2023-04-03 22:17:45.861160000 +0200 -@@ -342,8 +342,7 @@ - #ifndef NO_ZPIPE - len = strlen(filename); - if (len > 2 && !strcmp(".Z", filename + (len - 2))) { -- mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_COMPRESS, NULL, "w"); -- mdata->type = XPMPIPE; -+ mdata->stream.file = NULL; - } else if (len > 3 && !strcmp(".gz", filename + (len - 3))) { - mdata->stream.file = xpmPipeThrough(fd, XPM_PATH_GZIP, "-q", "w"); - mdata->type = XPMPIPE; From 78c0e38f512820d2023447bc6f137da02fafda0921fe148f7b3d2d935cc3319a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 12 Apr 2023 16:04:18 +0000 Subject: [PATCH 4/6] - require compress (ncompress package) on openSUSE; it's not - improved latest changelog entry (better explnation) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=25 --- libXpm.changes | 11 +++++++++++ libXpm.spec | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libXpm.changes b/libXpm.changes index 0599982..7ea195f 100644 --- a/libXpm.changes +++ b/libXpm.changes @@ -1,7 +1,18 @@ +------------------------------------------------------------------- +Wed Apr 12 16:01:36 UTC 2023 - Stefan Dirsch + +- require compress (ncompress package) on openSUSE; it's not + supported on SLE + ------------------------------------------------------------------- Wed Apr 12 13:39:54 UTC 2023 - Fabian Vogt - Drop n_no-compress-on-sle.patch and set XPM_PATH_COMPRESS instead + (xpmPipeThrough function returns NULL when the command is not + available; so same result as with the patch applied; that the + child process for executing 'compress' returns with exit(1) + doesn't matter much; it might even be useful to see the error + message ...) ------------------------------------------------------------------- Wed Apr 12 11:59:25 UTC 2023 - Stefan Dirsch diff --git a/libXpm.spec b/libXpm.spec index 2193067..4d847ec 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -51,9 +51,12 @@ storing/retrieving X pixmaps to/from files. Summary: X Pixmap image file format library Group: System/Libraries # Invokes 'gzip' and 'uncompress' at runtime. -# 'compress' is not available on SLE and unlikely used. Requires: /usr/bin/gzip Requires: /usr/bin/uncompress +# 'compress' (ncompress package) is not available on SLE +%if 0%{?is_opensuse} +Requires: /usr/bin/compress +%endif %description -n %{lname} libXpm facilitates working with XPM (X PixMap), a format for From 6a24dd2dbb02b10639dbbc703299ab4c74ae018da986860dd5a995577fc157c7 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 13 Apr 2023 08:19:40 +0000 Subject: [PATCH 5/6] - suggests instead of require compress (see changelog below) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=26 --- libXpm.changes | 5 +++++ libXpm.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libXpm.changes b/libXpm.changes index 7ea195f..5a012d1 100644 --- a/libXpm.changes +++ b/libXpm.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 13 08:18:00 UTC 2023 - Stefan Dirsch + +- suggests instead of require compress (see changelog below) + ------------------------------------------------------------------- Wed Apr 12 16:01:36 UTC 2023 - Stefan Dirsch diff --git a/libXpm.spec b/libXpm.spec index 4d847ec..ed02efd 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -55,7 +55,7 @@ Requires: /usr/bin/gzip Requires: /usr/bin/uncompress # 'compress' (ncompress package) is not available on SLE %if 0%{?is_opensuse} -Requires: /usr/bin/compress +Suggests: /usr/bin/compress %endif %description -n %{lname} From 7fee1f4ec9c2700bec03755547eaef4f15181633a1ecdaec888398f8db99e0cb Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Thu, 13 Apr 2023 09:32:33 +0000 Subject: [PATCH 6/6] - with switching to suggests making use of (n)compress no longer needs to be limited to openSUSE OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libXpm?expand=0&rev=27 --- libXpm.changes | 6 ++++++ libXpm.spec | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libXpm.changes b/libXpm.changes index 5a012d1..aab7e9c 100644 --- a/libXpm.changes +++ b/libXpm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 13 09:24:55 UTC 2023 - Stefan Dirsch + +- with switching to suggests making use of (n)compress no longer + needs to be limited to openSUSE + ------------------------------------------------------------------- Thu Apr 13 08:18:00 UTC 2023 - Stefan Dirsch diff --git a/libXpm.spec b/libXpm.spec index ed02efd..ac91e98 100644 --- a/libXpm.spec +++ b/libXpm.spec @@ -54,9 +54,7 @@ Group: System/Libraries Requires: /usr/bin/gzip Requires: /usr/bin/uncompress # 'compress' (ncompress package) is not available on SLE -%if 0%{?is_opensuse} Suggests: /usr/bin/compress -%endif %description -n %{lname} libXpm facilitates working with XPM (X PixMap), a format for