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: Include manpages explaining Fedora’s various Emacs builds.
Date: Mon, 29 Jun 2026 00:38:33 GMT	[thread overview]
Message-ID: <178269351315.1.14844371474684582850.rpms-emacs-9682cf426df2@fedoraproject.org> (raw)

A new commit has been pushed.

Repo   : rpms/emacs
Branch : rawhide
Commit : 9682cf426df240bfdecf26c774c70265aee724a7
Author : Peter Oliver <git@mavit.org.uk>
Date   : 2026-06-29T01:36:26+01:00
Stats  : +230/-2 in 6 file(s)
URL    : https://src.fedoraproject.org/rpms/emacs/c/9682cf426df240bfdecf26c774c70265aee724a7?branch=rawhide

Log:
Include manpages explaining Fedora’s various Emacs builds.

---
diff --git a/emacs-desktop.1 b/emacs-desktop.1
new file mode 100644
index 0000000..016db8d
--- /dev/null
+++ b/emacs-desktop.1
@@ -0,0 +1,41 @@
+.TH EMACS-DESKTOP 1 "2026-06-29" "GNU Emacs" "Fedora Linux"
+.
+.SH NAME
+emacs-desktop \- Emacs desktop wrapper
+.
+.SH SYNOPSIS
+.B emacs-desktop
+[
+.I command-line switches
+] [
+.I files ...\&
+]
+.
+.SH DESCRIPTION
+Fedora Linux includes several different builds of GNU Emacs, each using
+different graphical toolkits (or none at all).  However, the Emacs
+developers recommend not running a pure GTK build of Emacs on the X
+Window System.  Fedora provides a wrapper, \fBemacs-desktop\fR, which
+will try to guess a suitable build, from those installed, for the
+current desktop environment.
+.
+.P
+Note that a favoured build can be selected using the \fBalternatives\fR
+system, with \fBemacs-desktop\fR taking the highest priority by default.
+.
+.SH SEE ALSO
+.BR alternatives (1),
+.BR emacs (1),
+.BR emacs-gtk+x11 (1),
+.BR emacs-lucid (1),
+.BR emacs-nw (1),
+.BR emacs-pgtk (1),
+.
+.SH AUTHORS
+Peter Oliver
+.
+.\" Local Variables:
+.\" eval: (add-hook 'before-save-hook 'time-stamp nil t)
+.\" time-stamp-pattern: "^\\.TH [^ ]+ [^ ]+ \"?%Y-%m-%d\\_>"
+.\" time-stamp-time-zone: "UTC0"
+.\" End:

diff --git a/emacs-gtk+x11.1 b/emacs-gtk+x11.1
new file mode 100644
index 0000000..0753788
--- /dev/null
+++ b/emacs-gtk+x11.1
@@ -0,0 +1,41 @@
+.TH EMACS-GTK+X11 1 "2026-06-29" "GNU Emacs" "Fedora Linux"
+.
+.SH NAME
+emacs-gtk+x11 \- Emacs with support for X11, using the GTK toolkit
+.
+.SH SYNOPSIS
+.B emacs-gtk+x11
+[
+.I command-line switches
+] [
+.I files ...\&
+]
+.
+.SH DESCRIPTION
+Fedora Linux includes several different builds of GNU Emacs, each using
+different graphical toolkits (or none at all).
+.
+.P
+The \fBemacs-gtk+x11\fR binary uses the GTK toolkit, for use on the X
+Window System.
+.
+.P
+Note that a favoured build can be selected using the \fBalternatives\fR
+system.
+.
+.SH SEE ALSO
+.BR alternatives (1),
+.BR emacs (1),
+.BR emacs-desktop (1),
+.BR emacs-lucid (1),
+.BR emacs-nw (1),
+.BR emacs-pgtk (1),
+.
+.SH AUTHORS
+Peter Oliver
+.
+.\" Local Variables:
+.\" eval: (add-hook 'before-save-hook 'time-stamp nil t)
+.\" time-stamp-pattern: "^\\.TH [^ ]+ [^ ]+ \"?%Y-%m-%d\\_>"
+.\" time-stamp-time-zone: "UTC0"
+.\" End:

diff --git a/emacs-lucid.1 b/emacs-lucid.1
new file mode 100644
index 0000000..69682ff
--- /dev/null
+++ b/emacs-lucid.1
@@ -0,0 +1,41 @@
+.TH EMACS-LUCID 1 "2026-06-29" "GNU Emacs" "Fedora Linux"
+.
+.SH NAME
+emacs-lucid \- Emacs with support for X11, using the Lucid toolkit
+.
+.SH SYNOPSIS
+.B emacs-lucid
+[
+.I command-line switches
+] [
+.I files ...\&
+]
+.
+.SH DESCRIPTION
+Fedora Linux includes several different builds of GNU Emacs, each using
+different graphical toolkits (or none at all).
+.
+.P
+The \fBemacs-lucid\fR binary uses the Lucid toolkit, for use on the X
+Window System.
+.
+.P
+Note that a favoured build can be selected using the \fBalternatives\fR
+system.
+.
+.SH SEE ALSO
+.BR alternatives (1),
+.BR emacs (1),
+.BR emacs-desktop (1),
+.BR emacs-gtk+x11 (1),
+.BR emacs-nw (1),
+.BR emacs-pgtk (1),
+.
+.SH AUTHORS
+Peter Oliver
+.
+.\" Local Variables:
+.\" eval: (add-hook 'before-save-hook 'time-stamp nil t)
+.\" time-stamp-pattern: "^\\.TH [^ ]+ [^ ]+ \"?%Y-%m-%d\\_>"
+.\" time-stamp-time-zone: "UTC0"
+.\" End:

diff --git a/emacs-nw.1 b/emacs-nw.1
new file mode 100644
index 0000000..77aafbb
--- /dev/null
+++ b/emacs-nw.1
@@ -0,0 +1,43 @@
+.TH EMACS-NW 1 "2026-06-29" "GNU Emacs" "Fedora Linux"
+.
+.SH NAME
+emacs-nw \- Emacs without graphical display support
+.
+.SH SYNOPSIS
+.B emacs-nw
+[
+.I command-line switches
+] [
+.I files ...\&
+]
+.
+.SH DESCRIPTION
+Fedora Linux includes several different builds of GNU Emacs, each using
+different graphical toolkits (or none at all).
+.
+.P
+The \fBemacs-nw\fR binary has no graphical display support, and can be
+run on a terminal only.  The package that contains it has many fewer
+dependencies on other packages, which can lead to significantly smaller
+installation sizes on servers without graphical environments.
+.
+.P
+Note that a favoured build can be selected using the \fBalternatives\fR
+system.
+.
+.SH SEE ALSO
+.BR alternatives (1),
+.BR emacs (1),
+.BR emacs-desktop (1),
+.BR emacs-gtk+x11 (1),
+.BR emacs-lucid (1),
+.BR emacs-pgtk (1),
+.
+.SH AUTHORS
+Peter Oliver
+.
+.\" Local Variables:
+.\" eval: (add-hook 'before-save-hook 'time-stamp nil t)
+.\" time-stamp-pattern: "^\\.TH [^ ]+ [^ ]+ \"?%Y-%m-%d\\_>"
+.\" time-stamp-time-zone: "UTC0"
+.\" End:

diff --git a/emacs-pgtk.1 b/emacs-pgtk.1
new file mode 100644
index 0000000..d6ec64d
--- /dev/null
+++ b/emacs-pgtk.1
@@ -0,0 +1,44 @@
+.TH EMACS-PGTK 1 "2026-06-29" "GNU Emacs" "Fedora Linux"
+.
+.SH NAME
+emacs-pgtk \- Emacs with support for Wayland, using the GTK toolkit
+.
+.SH SYNOPSIS
+.B emacs-pgtk
+[
+.I command-line switches
+] [
+.I files ...\&
+]
+.
+.SH DESCRIPTION
+Fedora Linux includes several different builds of GNU Emacs, each using
+different graphical toolkits (or none at all).
+.
+.P
+The \fBemacs-pgtk\fR binary uses purely the GTK toolkit, and is
+suggested for use with Wayland displays.  The Emacs developers recommend
+not running it on the X Window System.
+.
+.P
+Note that a favoured build can be selected using the \fBalternatives\fR
+system.  Note also that Fedora provides a wrapper, \fBemacs-desktop\fR, which
+will try to guess a suitable build, from those installed, for the
+current desktop environment.
+.
+.SH SEE ALSO
+.BR alternatives (1),
+.BR emacs (1),
+.BR emacs-desktop (1),
+.BR emacs-gtk+x11 (1),
+.BR emacs-lucid (1),
+.BR emacs-nw (1),
+.
+.SH AUTHORS
+Peter Oliver
+.
+.\" Local Variables:
+.\" eval: (add-hook 'before-save-hook 'time-stamp nil t)
+.\" time-stamp-pattern: "^\\.TH [^ ]+ [^ ]+ \"?%Y-%m-%d\\_>"
+.\" time-stamp-time-zone: "UTC0"
+.\" End:

diff --git a/emacs.spec b/emacs.spec
index c3c299f..b1b02e3 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -35,11 +35,17 @@ Source103:     https://keys.openpgp.org/vks/v1/by-fingerprint/8DC2487E51ABDD90B5
 Source4:       dotemacs.el
 Source5:       site-start.el
 Source6:       default.el
-Source9:       emacs-desktop.sh.in
 
 Source10:      emacs_lisp.attr
 Source11:      emacs_lisp.rec
 
+Source20:      emacs-desktop.sh.in
+Source21:      emacs-desktop.1
+Source22:      emacs-gtk+x11.1
+Source23:      emacs-lucid.1
+Source24:      emacs-nw.1
+Source25:      emacs-pgtk.1
+
 # Avoid trademark issues
 Patch:         0001-Pong-and-Tetris-are-excluded.patch
 
@@ -515,7 +521,7 @@ cat > 10-source-directory.el << 'EOF'
 ;;; 10-source-directory.el ends here
 EOF
 
-sed -e 's|@bindir@|%{_bindir}|' %SOURCE9 > emacs-desktop.sh
+sed -e 's|@bindir@|%{_bindir}|' %SOURCE20 > emacs-desktop.sh
 
 
 %install
@@ -603,6 +609,13 @@ rm -f %{buildroot}%{_infodir}/dir
 # Install a wrapper to avoid running the Wayland-only build on X11
 install -p -m 0755 emacs-desktop.sh %{buildroot}%{_bindir}/emacs-desktop
 
+# Install Fedora-specific manpages:
+install -p -m 0644 %SOURCE21 %{buildroot}%{_mandir}/man1/%{basename %SOURCE21}
+install -p -m 0644 %SOURCE22 %{buildroot}%{_mandir}/man1/%{basename %SOURCE22}
+install -p -m 0644 %SOURCE23 %{buildroot}%{_mandir}/man1/%{basename %SOURCE23}
+install -p -m 0644 %SOURCE24 %{buildroot}%{_mandir}/man1/%{basename %SOURCE24}
+install -p -m 0644 %SOURCE25 %{buildroot}%{_mandir}/man1/%{basename %SOURCE25}
+
 # Remove duplicate desktop-related files
 rm %{buildroot}%{_datadir}/%{name}/%{version}/etc/%{name}.{desktop,metainfo.xml,service} \
    %{buildroot}%{_datadir}/%{name}/%{version}/etc/%{name}-mail.desktop \
@@ -763,6 +776,8 @@ fi
 %{_bindir}/emacs-desktop
 %{_bindir}/emacs-%{version}-pgtk
 %{_bindir}/emacs-pgtk
+%{_mandir}/man1/emacs-desktop.1*
+%{_mandir}/man1/emacs-pgtk.1*
 %{_datadir}/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml
 
 %if %{with gtkx11}
@@ -770,6 +785,7 @@ fi
 %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-gtk+x11
 %{_bindir}/emacs-gtk+x11
+%{_mandir}/man1/emacs-gtk+x11.1*
 %endif
 
 %if %{with lucid}
@@ -777,6 +793,7 @@ fi
 %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}-lucid
 %{_bindir}/emacs-lucid
+%{_mandir}/man1/emacs-lucid.1*
 %endif
 
 %if %{with nw}
@@ -786,6 +803,7 @@ fi
 %{_bindir}/emacs-%{version}-nw
 %{_bindir}/emacs-nox
 %{_bindir}/emacs-nw
+%{_mandir}/man1/emacs-nw.1*
 %endif
 
 %files -n emacsclient

                 reply	other threads:[~2026-06-29  0:38 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=178269351315.1.14844371474684582850.rpms-emacs-9682cf426df2@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