Accepting request 1079097 from X11:XOrg

- with switching to suggests making use of (n)compress no longer
  needs to be limited to openSUSE

- suggests instead of require compress (see changelog below) 

- require compress (ncompress package) on openSUSE; it's not
  supported on SLE

- 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 ...)

- 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

- Depend on /usr/bin/gzip, not gzip

OBS-URL: https://build.opensuse.org/request/show/1079097
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libXpm?expand=0&rev=14

libXpm.changes

@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Apr 13 09:24:55 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- 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 <sndirsch@suse.com>
+
+- suggests instead of require compress (see changelog below) 
+
+-------------------------------------------------------------------
+Wed Apr 12 16:01:36 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
+
+- require compress (ncompress package) on openSUSE; it's not
+  supported on SLE
+
+-------------------------------------------------------------------
+Wed Apr 12 13:39:54 UTC 2023 - Fabian Vogt <fvogt@suse.com>
+
+- 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 <sndirsch@suse.com>
+
+- 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 <fvogt@suse.com>
+
+- Depend on /usr/bin/gzip, not gzip
+
 -------------------------------------------------------------------
 Mon Apr  3 20:27:28 UTC 2023 - Stefan Dirsch <sndirsch@suse.com>
 

libXpm.spec

@@ -30,10 +30,9 @@ 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
-BuildRequires:  gzip
 BuildRequires:  libtool
 
 BuildRequires:  pkgconfig
@@ -51,8 +50,11 @@ 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
+# Invokes 'gzip' and 'uncompress' at runtime.
-Requires:       gzip
+Requires:       /usr/bin/gzip
+Requires:       /usr/bin/uncompress
+# 'compress' (ncompress package) is not available on SLE
+Suggests:       /usr/bin/compress
 
 %description -n %{lname}
 libXpm facilitates working with XPM (X PixMap), a format for
@@ -90,6 +92,7 @@ regard to its format.
 
 %build
 autoreconf -fi
+export XPM_PATH_COMPRESS=%{_bindir}/compress
 %configure --disable-static
 %make_build
 

n_no-compress-on-sle.patch

@@ -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;