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;