From 5492eaf2a9cc4af04d992984ec28891c81d116f3 Mon Sep 17 00:00:00 2001
From: Bojan Smojver <bojan@rexursive.com>
Date: Fri, 14 Jan 2022 21:59:18 +1100
Subject: [PATCH] Add imlib2 detection patch for RHEL7/8.

---
 xrdp-0.9.18-imlib2.patch | 22 ++++++++++++++++++++++
 xrdp.spec                | 17 +++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 xrdp-0.9.18-imlib2.patch

diff --git a/xrdp-0.9.18-imlib2.patch b/xrdp-0.9.18-imlib2.patch
new file mode 100644
index 0000000..3fbdcfa
--- /dev/null
+++ b/xrdp-0.9.18-imlib2.patch
@@ -0,0 +1,22 @@
+From 3de1e966b4c4113fd901f9ecd00cf59a3759e745 Mon Sep 17 00:00:00 2001
+From: matt335672 <30179339+matt335672@users.noreply.github.com>
+Date: Wed, 12 Jan 2022 11:41:26 +0000
+Subject: [PATCH] Support imlib2 on RHEL 7
+
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 44ac95a60..a7a10bf6e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -224,7 +224,7 @@ case "$with_imlib2" in
+         use_imlib2=no
+         ;;
+     yes)
+-        PKG_CHECK_MODULES([IMLIB2], [imlib2 >= 1.4.10],
++        PKG_CHECK_MODULES([IMLIB2], [imlib2 >= 1.4.5],
+             [use_imlib2=yes],
+             [AC_MSG_ERROR([please install libimlib2-dev or imlib2-devel])])
+         ;;
diff --git a/xrdp.spec b/xrdp.spec
index ff7fecb..418ef5d 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -9,10 +9,6 @@
 %global _hardlink /usr/sbin/hardlink
 %endif
 
-%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
-%global _with_imlib2 --with-imlib2
-%endif
-
 %if ! 0%{?fedora} && 0%{?rhel} <= 7
 %global _missing_braces -Wno-error=missing-braces
 %endif
@@ -21,7 +17,7 @@ Summary:   Open source remote desktop protocol (RDP) server
 Name:      xrdp
 Epoch:     1
 Version:   0.9.18
-Release:   2%{?dist}
+Release:   3%{?dist}
 License:   ASL 2.0 and GPLv2+ and MIT
 URL:       http://www.xrdp.org/
 Source0:   https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/xrdp-%{version}.tar.gz
@@ -42,15 +38,14 @@ Patch6:    xrdp-0.9.18-vnc-uninit.patch
 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
 Patch7:    xrdp-0.9.15-sesman-ini.patch
 %endif
+Patch8:    xrdp-0.9.18-imlib2.patch
 
 BuildRequires: make
 BuildRequires: gcc
 BuildRequires: libX11-devel
 BuildRequires: libXfixes-devel
 BuildRequires: libXrandr-devel
-%if 0%{?fedora} >= 34 || 0%{?rhel} >= 9
 BuildRequires: imlib2-devel
-%endif
 BuildRequires: openssl
 BuildRequires: pam-devel
 BuildRequires: pkgconfig(fuse)
@@ -117,7 +112,7 @@ echo '#!/bin/bash -l
 %build
 CFLAGS="$RPM_OPT_FLAGS -Wno-error=deprecated-declarations %{?_missing_braces}" \
 %configure --enable-fuse --enable-pixman --enable-painter --enable-vsock \
-           --enable-ipv6 --with-socketdir=%{_rundir}/%{name} %{?_with_imlib2}
+           --enable-ipv6 --with-socketdir=%{_rundir}/%{name} --with-imlib2
 %make_build
 
 # SELinux policy module
@@ -292,6 +287,12 @@ fi
 %{_datadir}/selinux/*/%{name}.pp
 
 %changelog
+* Fri Jan 14 2022 Bojan Smojver <bojan@rexurive.com> - 1:0.9.18-3
+- Add patch for imlib2 on RHEL7/8
+
+* Wed Jan 12 2022 Bojan Smojver <bojan@rexurive.com> - 1:0.9.18-2
+- Bump release up for rebuild
+
 * Tue Jan 11 2022 Bojan Smojver <bojan@rexurive.com> - 1:0.9.18-1
 - Bump up to 0.9.18