From ac07724a18860e10f0bb048db9e3bf33e71b6791 Mon Sep 17 00:00:00 2001
From: Bhavin Gandhi <bhavin7392@gmail.com>
Date: Aug 11 2020 14:47:16 +0000
Subject: emacs-27.1 is available (#1867841)


- Add systemd-devel to support Type=notify in unit file
  - https://debbugs.gnu.org/cgi/bugreport.cgi?bug=42242
- Build with Cairo and Jansson support
- Remove ImageMagick dependency as it's no longer used
- Keep the emacs.pdmp as executable_name.pdmp in _bindir

Signed-off-by: Bhavin Gandhi <bhavin7392@gmail.com>

---

diff --git a/emacs.spec b/emacs.spec
index 98e70ef..d9266fa 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -4,8 +4,8 @@
 Summary:       GNU Emacs text editor
 Name:          emacs
 Epoch:         1
-Version:       26.3
-Release:       4%{?dist}
+Version:       27.1
+Release:       1%{?dist}
 License:       GPLv3+ and CC0-1.0
 URL:           http://www.gnu.org/software/emacs/
 Source0:       https://ftp.gnu.org/gnu/emacs/emacs-%{version}.tar.xz
@@ -53,7 +53,6 @@ BuildRequires: gnutls-devel
 BuildRequires: librsvg2-devel
 BuildRequires: m17n-lib-devel
 BuildRequires: libotf-devel
-BuildRequires: ImageMagick-devel
 BuildRequires: libselinux-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: gpm-devel
@@ -66,6 +65,9 @@ BuildRequires: texinfo
 BuildRequires: gzip
 BuildRequires: desktop-file-utils
 BuildRequires: libacl-devel
+BuildRequires: harfbuzz-devel
+BuildRequires: jansson-devel
+BuildRequires: systemd-devel
 
 BuildRequires: gtk3-devel
 BuildRequires: webkit2gtk3-devel
@@ -240,7 +242,7 @@ LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
 
 %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
            --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
-           --with-xwidgets --with-modules
+           --with-xwidgets --with-modules --with-harfbuzz --with-cairo --with-json
 make bootstrap
 %{setarch} %make_build
 cd ..
@@ -253,7 +255,7 @@ LDFLAGS=-Wl,-z,relro;  export LDFLAGS;
 
 %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
            --with-tiff --with-xft --with-xpm --with-x-toolkit=lucid --with-gpm=no \
-           --with-modules
+           --with-modules --with-harfbuzz --with-cairo --with-json
 make bootstrap
 %{setarch} %make_build
 cd ..
@@ -261,7 +263,7 @@ cd ..
 # Build binary without X support
 mkdir build-nox && cd build-nox
 ln -s ../configure .
-%configure --with-x=no --with-modules
+%configure --with-x=no --with-modules --with-json
 %{setarch} %make_build
 cd ..
 
@@ -297,15 +299,23 @@ cd ..
 rm %{buildroot}%{_bindir}/emacs
 touch %{buildroot}%{_bindir}/emacs
 
+# Remove emacs.pdmp from common
+rm %{buildroot}%{emacs_libexecdir}/emacs.pdmp
+
 # Do not compress the files which implement compression itself (#484830)
 gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-compr.el.gz
 gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka-cmpr-hook.el.gz
 
+# Install emacs.pdmp of the emacs with GTK+
+install -p -m 0644 build-gtk/src/emacs.pdmp %{buildroot}%{_bindir}/emacs-%{version}.pdmp
+
 # Install the emacs with LUCID toolkit
 install -p -m 0755 build-lucid/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-lucid
+install -p -m 0644 build-lucid/src/emacs.pdmp %{buildroot}%{_bindir}/emacs-%{version}-lucid.pdmp
 
 # Install the emacs without X
 install -p -m 0755 build-nox/src/emacs %{buildroot}%{_bindir}/emacs-%{version}-nox
+install -p -m 0644 build-nox/src/emacs.pdmp %{buildroot}%{_bindir}/emacs-%{version}-nox.pdmp
 
 # Make sure movemail isn't setgid
 chmod 755 %{buildroot}%{emacs_libexecdir}/movemail
@@ -418,20 +428,24 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
 
 %files
 %{_bindir}/emacs-%{version}
+%{_bindir}/emacs-%{version}.pdmp
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/icons/hicolor/*/apps/emacs.png
 %{_datadir}/icons/hicolor/scalable/apps/emacs.svg
+%{_datadir}/icons/hicolor/scalable/apps/emacs.ico
 %{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document.svg
 
 %files lucid
 %{_bindir}/emacs-%{version}-lucid
+%{_bindir}/emacs-%{version}-lucid.pdmp
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %attr(0755,-,-) %ghost %{_bindir}/emacs-lucid
 
 %files nox
 %{_bindir}/emacs-%{version}-nox
+%{_bindir}/emacs-%{version}-nox.pdmp
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %attr(0755,-,-) %ghost %{_bindir}/emacs-nox
 
@@ -468,6 +482,12 @@ rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg
 %{_includedir}/emacs-module.h
 
 %changelog
+* Tue Aug 11 2020 Bhavin Gandhi <bhavin7392@gmail.com> - 1:27.1-1
+- emacs-27.1 is available (#1867841)
+- Add systemd-devel to support Type=notify in unit file
+- Build with Cairo and Jansson support
+- Remove ImageMagick dependency as it's no longer used
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:26.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 681e16a..29b7d19 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (emacs-26.3.tar.xz) = 4d5a4319253afb081e105a3697eb6eeb8d8a0da18cd41346e376ca5af1e180a26e641f76c64fad1b0253168f14a511f0a4d9d4141524fb1cf4d04f25b05a76e9
-SHA512 (emacs-26.3.tar.xz.sig) = c7cd4ae7dc2c14f705c48ae120dc85f32cb254b99dc192aa55c08af7f71bed31836ca8e8522731a46b6e16cca684b9823b4b90ae3a358dc2f8bcac7c5741847e
+SHA512 (emacs-27.1.tar.xz) = dfb26531d2c19cf9fb56505f03d799654b45e5f9528e777900e8280ed2c1d21e04c52f510528e31e015977c471ae63164cedee6174b7439ebcf479a21fc18064
+SHA512 (emacs-27.1.tar.xz.sig) = 8873c9f7a812db4d44625eb5d4de1a3e1abb458584a70e5e68dd97b79361ce729f9007cb41d89ba9d9a5730fa024913690bdfa71f7482554aaf45cd635c30355