Re-enable gtkx11, lucid, nw

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2024-10-08 13:25:28 +03:00
parent 2ee32c0e8e
commit 01bcd4a03a
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3

View File

@ -1,11 +1,9 @@
# This file is encoded in UTF-8. -*- coding: utf-8 -*- # This file is encoded in UTF-8. -*- coding: utf-8 -*-
%bcond gpm %[!(0%{?rhel} >= 10)] %bcond gpm %[!(0%{?rhel} >= 10)]
%bcond webkit %[!(0%{?rhel} >= 10)] %bcond_without gtkx11
%bcond_without lucid
%bcond_with gtkx11 %bcond_without nw
%bcond_with lucid
%bcond_with nw
Summary: GNU Emacs text editor Summary: GNU Emacs text editor
Name: emacs 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" 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} 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) #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} #cp -ar build-gtk+x11/native-lisp/${gtkx11_comp_native_ver} %{buildroot}%{native_lisp}
(TOPDIR=${PWD} #(TOPDIR=${PWD}
cd %{buildroot} # 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" \) # 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 echo %{emacs_libexecdir}/${gtkx11_pdmp} >> gtk+x11-eln-filelist
%endif %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" 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} install -p -m 0644 build-lucid/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${lucid_pdmp}
lucid_comp_native_ver=$(ls -1 build-lucid/native-lisp) #lucid_comp_native_ver=$(ls -1 build-lucid/native-lisp)
cp -ar build-lucid/native-lisp/${lucid_comp_native_ver} %{buildroot}%{native_lisp} #cp -ar build-lucid/native-lisp/${lucid_comp_native_ver} %{buildroot}%{native_lisp}
(TOPDIR=${PWD} #(TOPDIR=${PWD}
cd %{buildroot} # 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" \) # 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 echo %{emacs_libexecdir}/${lucid_pdmp} >> lucid-eln-filelist
%endif %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" 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} install -p -m 0644 build-nw/src/emacs.pdmp %{buildroot}%{emacs_libexecdir}/${nw_pdmp}
nw_comp_native_ver=$(ls -1 build-nw/native-lisp) #nw_comp_native_ver=$(ls -1 build-nw/native-lisp)
cp -ar build-nw/native-lisp/${nw_comp_native_ver} %{buildroot}%{native_lisp} #cp -ar build-nw/native-lisp/${nw_comp_native_ver} %{buildroot}%{native_lisp}
(TOPDIR=${PWD} #(TOPDIR=${PWD}
cd %{buildroot} # 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" \) # 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 echo %{emacs_libexecdir}/${nw_pdmp} >> nw-eln-filelist
%endif %endif
@ -720,21 +718,21 @@ fi
%{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml
%if %{with gtkx11} %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 %attr(0755,-,-) %ghost %{_bindir}/emacs
%{_bindir}/emacs-%{version}-gtk+x11 %{_bindir}/emacs-%{version}-gtk+x11
%{_bindir}/emacs-gtk+x11 %{_bindir}/emacs-gtk+x11
%endif %endif
%if %{with lucid} %if %{with lucid}
%files lucid -f lucid-eln-filelist -f lucid-dirs %files lucid -f lucid-eln-filelist
%attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs
%{_bindir}/emacs-%{version}-lucid %{_bindir}/emacs-%{version}-lucid
%{_bindir}/emacs-lucid %{_bindir}/emacs-lucid
%endif %endif
%if %{with nw} %if %{with nw}
%files nw -f nw-eln-filelist -f nw-dirs %files nw -f nw-eln-filelist
%attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs
%{_bindir}/emacs-%{version}-nox %{_bindir}/emacs-%{version}-nox
%{_bindir}/emacs-%{version}-nw %{_bindir}/emacs-%{version}-nw