From 01bcd4a03ac0d58ee5553f1932d387c5cb00755b Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Tue, 8 Oct 2024 13:25:28 +0300
Subject: [PATCH] Re-enable gtkx11, lucid, nw

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
---
 emacs.spec | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/emacs.spec b/emacs.spec
index 7714c47..d9cc7e5 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,11 +1,9 @@
 # This file is encoded in UTF-8.  -*- coding: utf-8 -*-
 
 %bcond gpm %[!(0%{?rhel} >= 10)]
-%bcond webkit %[!(0%{?rhel} >= 10)]
-
-%bcond_with gtkx11
-%bcond_with lucid
-%bcond_with nw
+%bcond_without gtkx11
+%bcond_without lucid
+%bcond_without nw
 
 Summary:       GNU Emacs text editor
 Name:          emacs
@@ -572,12 +570,12 @@ echo %{emacs_libexecdir}/${pgtk_pdmp} >> pgtk-eln-filelist
 gtkx11_pdmp="emacs-$(./build-gtk+x11/src/emacs --fingerprint 2>&1 | sed 's/.* //').pdmp"
 install -p -m 0644 build-gtk+x11/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${gtkx11_pdmp}
 
-gtkx11_comp_native_ver=$(ls -1 build-gtk+x11/native-lisp)
-cp -ar build-gtk+x11/native-lisp/${gtkx11_comp_native_ver} %{buildroot}%{native_lisp}
-(TOPDIR=${PWD}
- cd %{buildroot}
- find .%{native_lisp}/${gtkx11_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/gtk+x11-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/gtk+x11-dirs "%%%%dir %%p\n" \)
-)
+#gtkx11_comp_native_ver=$(ls -1 build-gtk+x11/native-lisp)
+#cp -ar build-gtk+x11/native-lisp/${gtkx11_comp_native_ver} %{buildroot}%{native_lisp}
+#(TOPDIR=${PWD}
+# cd %{buildroot}
+# find .%{native_lisp}/${gtkx11_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/gtk+x11-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/gtk+x11-dirs "%%%%dir %%p\n" \)
+#)
 echo %{emacs_libexecdir}/${gtkx11_pdmp} >> gtk+x11-eln-filelist
 %endif
 
@@ -585,12 +583,12 @@ echo %{emacs_libexecdir}/${gtkx11_pdmp} >> gtk+x11-eln-filelist
 lucid_pdmp="emacs-$(./build-lucid/src/emacs --fingerprint 2>&1 | sed 's/.* //').pdmp"
 install -p -m 0644 build-lucid/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${lucid_pdmp}
 
-lucid_comp_native_ver=$(ls -1 build-lucid/native-lisp)
-cp -ar build-lucid/native-lisp/${lucid_comp_native_ver} %{buildroot}%{native_lisp}
-(TOPDIR=${PWD}
- cd %{buildroot}
- find .%{native_lisp}/${lucid_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/lucid-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/lucid-dirs "%%%%dir %%p\n" \)
-)
+#lucid_comp_native_ver=$(ls -1 build-lucid/native-lisp)
+#cp -ar build-lucid/native-lisp/${lucid_comp_native_ver} %{buildroot}%{native_lisp}
+#(TOPDIR=${PWD}
+# cd %{buildroot}
+# find .%{native_lisp}/${lucid_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/lucid-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/lucid-dirs "%%%%dir %%p\n" \)
+#)
 echo %{emacs_libexecdir}/${lucid_pdmp} >> lucid-eln-filelist
 %endif
 
@@ -598,12 +596,12 @@ echo %{emacs_libexecdir}/${lucid_pdmp} >> lucid-eln-filelist
 nw_pdmp="emacs-$(./build-nw/src/emacs --fingerprint 2>&1 | sed 's/.* //').pdmp"
 install -p -m 0644 build-nw/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${nw_pdmp}
 
-nw_comp_native_ver=$(ls -1 build-nw/native-lisp)
-cp -ar build-nw/native-lisp/${nw_comp_native_ver} %{buildroot}%{native_lisp}
-(TOPDIR=${PWD}
- cd %{buildroot}
- find .%{native_lisp}/${nw_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/nw-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/nw-dirs "%%%%dir %%p\n" \)
-)
+#nw_comp_native_ver=$(ls -1 build-nw/native-lisp)
+#cp -ar build-nw/native-lisp/${nw_comp_native_ver} %{buildroot}%{native_lisp}
+#(TOPDIR=${PWD}
+# cd %{buildroot}
+# find .%{native_lisp}/${nw_comp_native_ver} \( -type f -name '*eln' -fprintf $TOPDIR/nw-eln-filelist "%%%%attr(755,-,-) %%p\n" \) -o \( -type d -fprintf $TOPDIR/nw-dirs "%%%%dir %%p\n" \)
+#)
 echo %{emacs_libexecdir}/${nw_pdmp} >> nw-eln-filelist
 %endif
 
@@ -720,21 +718,21 @@ fi
 %{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml
 
 %if %{with gtkx11}
-%files gtk+x11 -f gtk+x11-eln-filelist -f gtk+x11-dirs
+%files gtk+x11 -f gtk+x11-eln-filelist
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-gtk+x11
 %{_bindir}/emacs-gtk+x11
 %endif
 
 %if %{with lucid}
-%files lucid -f lucid-eln-filelist -f lucid-dirs
+%files lucid -f lucid-eln-filelist
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-lucid
 %{_bindir}/emacs-lucid
 %endif
 
 %if %{with nw}
-%files nw -f nw-eln-filelist -f nw-dirs
+%files nw -f nw-eln-filelist
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-nox
 %{_bindir}/emacs-%{version}-nw