public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Peter Oliver <git@mavit.org.uk>
To: git-commits@fedoraproject.org
Subject: [rpms/emacs] rawhide: Simplify info installation
Date: Tue, 09 Jun 2026 11:47:55 GMT [thread overview]
Message-ID: <178100567583.1.5768960671244638786.rpms-emacs-60727c2aaefe@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/emacs
Branch : rawhide
Commit : 60727c2aaefe0431e18bf87779762710d0ba506d
Author : Peter Oliver <git@mavit.org.uk>
Date : 2026-06-09T01:51:38+01:00
Stats : +3/-16 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/emacs/c/60727c2aaefe0431e18bf87779762710d0ba506d?branch=rawhide
Log:
Simplify info installation
We haven’t needed to worry about rhbz#927996 since texinfo 6.1.
---
diff --git a/emacs.spec b/emacs.spec
index e50fc29..c3c299f 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -580,9 +580,6 @@ install -p -m 0644 10-source-directory.el %{buildroot}%{site_start_d}/
mv %{buildroot}%{_mandir}/man1/{ctags.1.gz,gctags.1.gz}
mv %{buildroot}%{_bindir}/{ctags,gctags}
-# BZ 927996
-mv %{buildroot}%{_infodir}/{info.info.gz,info.gz}
-
# Default initialization file
mkdir -p %{buildroot}%{_sysconfdir}/skel
install -p -m 0644 %SOURCE4 %{buildroot}%{_sysconfdir}/skel/.emacs
@@ -600,7 +597,7 @@ install -p -m 0644 %SOURCE10 %{buildroot}%{_fileattrsdir}
install -p -m 0755 %SOURCE11 %{buildroot}%{_rpmconfigdir}
install -p -m 0644 macros.emacs %{buildroot}%{_rpmmacrodir}
-# After everything is installed, remove info dir
+# After everything is installed, remove info "dir"
rm -f %{buildroot}%{_infodir}/dir
# Install a wrapper to avoid running the Wayland-only build on X11
@@ -629,17 +626,6 @@ rm -f *-filelist {common,el}-*-files
)
-# Sorted list of info files
-%define info_files auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede ediff edt efaq eglot eieio eintr elisp emacs-gnutls emacs-mime emacs epa erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido mairix-el message mh-e modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode tramp transient url use-package vhdl-mode vip viper vtable widget wisent woman
-
-for info_f in %info_files; do
- echo "%{_infodir}/${info_f}.info*" >> info-filelist
-done
-# info.gz is a rename of info.info.gz and thus needs special handling
-echo "%{_infodir}/info*" >> info-filelist
-# elisp.info.gz has additional files
-echo "%{_infodir}/elisp_type_hierarchy*" >> info-filelist
-
# Put the lists together after filtering ./usr to /usr
sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files
grep -vhE '%{site_lisp}(|/(default\.el|site-start\.d|site-start\.el))$' {common,el}-*-files > common-filelist
@@ -807,7 +793,7 @@ fi
%{_bindir}/emacsclient
%{_mandir}/man1/emacsclient.1*
-%files common -f common-filelist -f info-filelist
+%files common -f common-filelist
%config(noreplace) %{_sysconfdir}/skel/.emacs
%{_fileattrsdir}/emacs_lisp.attr
%{_rpmconfigdir}/emacs_lisp.rec
@@ -824,6 +810,7 @@ fi
%{_datadir}/icons/hicolor/scalable/apps/emacs.svg
%{_datadir}/icons/hicolor/scalable/apps/emacs.ico
%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
+%{_infodir}/*
%{_mandir}/man1/ebrowse.1*
%{_mandir}/man1/emacs.1*
%{_mandir}/man1/etags.1*
reply other threads:[~2026-06-09 11:47 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178100567583.1.5768960671244638786.rpms-emacs-60727c2aaefe@fedoraproject.org \
--to=git@mavit.org.uk \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox