From 96f4ba399ce37be5d90a5ff1641eb04a6c578042 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Fri, 11 Feb 2022 10:43:35 +0900
Subject: [PATCH] Resolves: #2051670 xemacs is a dead package

---
 anthy-unicode-HEAD.patch | 26 ++++++++++++++++++++++++++
 anthy-unicode.spec       | 37 ++++++++++++++++++++++++-------------
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/anthy-unicode-HEAD.patch b/anthy-unicode-HEAD.patch
index e69de29..c4df9e2 100644
--- a/anthy-unicode-HEAD.patch
+++ b/anthy-unicode-HEAD.patch
@@ -0,0 +1,26 @@
+From d9355d3e0fac58eab16684fed2715cc91f68d39e Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 11 Feb 2022 10:28:18 +0900
+Subject: [PATCH] src-util: set-face-underline is not available in xemacs Lisp
+
+---
+ src-util/anthy-unicode.el | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src-util/anthy-unicode.el b/src-util/anthy-unicode.el
+index 14a9db4..902c7ac 100644
+--- a/src-util/anthy-unicode.el
++++ b/src-util/anthy-unicode.el
+@@ -74,7 +74,8 @@
+ (defvar anthy-highlight-face nil)
+ (defvar anthy-underline-face nil)
+ (copy-face 'highlight 'anthy-highlight-face)
+-(set-face-underline 'anthy-highlight-face t)
++(if (not (featurep 'xemacs))
++    (set-face-underline 'anthy-highlight-face t))
+ (copy-face 'underline 'anthy-underline-face)
+ 
+ ;;
+-- 
+2.33.1
+
diff --git a/anthy-unicode.spec b/anthy-unicode.spec
index 2e65729..41e3528 100644
--- a/anthy-unicode.spec
+++ b/anthy-unicode.spec
@@ -1,18 +1,26 @@
 %global pkg  anthy-unicode
-%bcond_with xemacs
 %bcond_without autoreconf
 
+%if (0%{?fedora} > 36 || 0%{?rhel} > 7)
+%bcond_with    xemacs
+%else
+%bcond_without xemacs
+%endif
+
+
 Name:  anthy-unicode
 Version: 1.0.0.20211224
-Release: 2%{?dist}
+Release: 3%{?dist}
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPLv2+ and GPLv2 and Public Domain
 URL:  https://github.com/fujiwarat/anthy-unicode/wiki
 BuildRequires: emacs
 BuildRequires: gcc
 BuildRequires: git
-%if 0%{?rhel} == 0
+%if %{with xemacs}
 BuildRequires: xemacs
+# overlay.el is required by anthy-unicode.el and anthy-unicode-isearch.el
+BuildRequires: xemacs-packages-extra
 %endif
 %if %{with autoreconf}
 BuildRequires: autoconf
@@ -25,6 +33,7 @@ Source0: https://github.com/fujiwarat/anthy-unicode/releases/download/%{version}
 Source1: %{name}-init.el
 # Upstreamed patches
 #Patch0: %%{name}-HEAD.patch
+Patch0: %{name}-HEAD.patch
 
 Summary: Japanese character set input library for Unicode
 
@@ -45,7 +54,7 @@ BuildArch: noarch
 This package contains the byte compiled elips packages to run %{pkg}
 with GNU Emacs.
 
-%if 0%{?rhel} == 0
+%if %{with xemacs}
 %package -n xemacs-%{pkg}
 Summary: XEmacs files for %{pkg}
 Requires: %{name} = %{version}-%{release}
@@ -86,22 +95,21 @@ rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 
-%if 0%{?rhel} == 0
+%if %{with xemacs}
 ## for xemacs-anthy
 mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 # FIXME lisp build
-%if %{with xemacs}
 pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util
 make clean
-make EMACS=xemacs lispdir="%{_xemacs_sitelispdir}/%{pkg}"
+#make EMACS=xemacs lispdir="%%{_xemacs_sitelispdir}/%%{pkg}"
+# The latest /usr/share/automake-*/am/lisp.am calls -L option for
+# $(EMACS) --batch but -L is not supported by xemacs.
+# Copy elisp-comp script here from old automake
+xemacs --batch --eval '(setq load-path (cons nil load-path))' -f batch-byte-compile *.el
+make
 make install-lispLISP DESTDIR=$RPM_BUILD_ROOT EMACS=xemacs lispdir="%{_xemacs_sitelispdir}/%{pkg}" INSTALL="install -p"
 popd
-%else
-mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}
-cp $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{pkg}/*.el \
-   $RPM_BUILD_ROOT%{_xemacs_sitelispdir}/%{pkg}/.
-%endif
 %endif
 
 %check
@@ -141,7 +149,7 @@ cd ..
 %{_emacs_sitestartdir}/*.el
 %dir %{_emacs_sitelispdir}/%{pkg}
 
-%if 0%{?rhel} == 0
+%if %{with xemacs}
 %files -n xemacs-%{pkg}
 %doc doc/ELISP
 %{_xemacs_sitelispdir}/%{pkg}/*.el
@@ -160,6 +168,9 @@ cd ..
 
 
 %changelog
+* Fri Feb 11 2022 Takao Fujiwara <fujiwara@redhat.com> 1.0.0.20211224-3
+- Resolves: #2051670 xemacs is a dead package
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0.20211224-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild