diff --git a/emacs-27.1.tar.xz.sig b/emacs-27.1.tar.xz.sig deleted file mode 100644 index f6e5fcbcdab7f3dd03bced544407e8ad83b960c4..0000000000000000000000000000000000000000 --- a/emacs-27.1.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEE1AWqLIYsVPF+7mvg6LzXhmr8+XgFAl8xzTYACgkQ6LzXhmr8 -+XjGjAf/S3scggDm1G3/EAKf0nMPBNBJaRboWohoUviu6/024WHKdsZ+qJ1w7Ad2 -saHbyoouiKJcq75rcfxe4faeRYy/V5QHchxfnvt092UnZrSMaq9jkjp5DUARxeZx -8pCB5OPC9BTMyT/gOe4mqIplYYBRsF26fcKfvcLTuZ45+4Jkii8CSNa9iJbYQoaW -41MqZFvPsQhRF7UH084ONxZnrXpBebrRSoY4yj1eM/lLtcHFgUvSg5UoP6EwXqcL -kkQB4+UGGOzxA3zwsLzmrq9gOa39w/pJY+Fs9+bYuf8xf2nbq3VnobKnPJveeMMq -0yTvrrY5E7/4vTXeb5ykmggNqTMa7w== -=29/a ------END PGP SIGNATURE----- diff --git a/emacs.spec b/emacs.spec index 0c310dbd395a14e60e9db7872afc79e3fd972207..7cc7fa83e05d858d8d8dc2c6963e607634d67433 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,21 +4,19 @@ Name: emacs Epoch: 1 Version: 27.1 -Release: 2 +Release: 3 Summary: An extensible GNU text editor License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz -Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig -Source2: gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg -Source3: site-start.el -Source4: default.el -Source5: dotemacs.el -Source6: emacs-terminal.sh -Source7: emacs.service -Source8: emacs.desktop -Source9: emacs-terminal.desktop -Source10: %{name}.appdata.xml +Source1: site-start.el +Source2: default.el +Source3: dotemacs.el +Source4: emacs-terminal.sh +Source5: emacs.service +Source6: emacs.desktop +Source7: emacs-terminal.desktop +Source8: %{name}.appdata.xml Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch @@ -30,7 +28,7 @@ BuildRequires: libpng-devel libjpeg-turbo-devel libjpeg-turbo ncurses-devel gpm- BuildRequires: libXau-devel libXdmcp-devel libXrender-devel libXt-devel libXpm-devel gtk3-devel BuildRequires: xorg-x11-proto-devel webkit2gtk3-devel librsvg2-devel BuildRequires: autoconf harfbuzz-devel jansson-devel systemd-devel gnupg2 -BuildRequires: libotf-devel ImageMagick-devel m17n-lib-devel liblockfile-devel +BuildRequires: libotf-devel m17n-lib-devel liblockfile-devel # For lucid BuildRequires: Xaw3d-devel @@ -164,7 +162,8 @@ LDFLAGS="-Wl,-z,relro,-z,now -pie"; 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 --without-libotf --without-m17n-flt --without-imagemagick CANNOT_DUMP=yes + --with-harfbuzz --with-cairo --with-json \ + --with-xwidgets --with-modules --without-libotf --without-m17n-flt --without-imagemagick make bootstrap %{setarch} %make_build cd .. @@ -177,7 +176,8 @@ LDFLAGS="-Wl,-z,relro,-z,now -pie"; 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 --without-libotf --without-m17n-flt --without-imagemagick CANNOT_DUMP=yes + --with-harfbuzz --with-cairo --with-json \ + --with-modules --without-libotf --without-m17n-flt --without-imagemagick make bootstrap %{setarch} %make_build cd .. @@ -189,7 +189,7 @@ ln -s ../configure . LDFLAGS="-Wl,-z,relro,-z,now -pie"; export LDFLAGS; -%configure --with-x=no --with-modules CANNOT_DUMP=yes +%configure --with-x=no --with-modules --with-json %{setarch} %make_build cd ../ @@ -225,22 +225,19 @@ rm %{buildroot}%{emacs_libexecdir}/emacs.pdmp gunzip %{buildroot}%{_datadir}/emacs/%{version}/lisp/jka*.el.gz -install -p -m 0644 build-gtk/src/emacs.pdmp %{buildroot}%{_bindir}/emacs-%{version}.pdmp %if !%{with bootstrap} 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 %endif 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 chmod 755 %{buildroot}%{emacs_libexecdir}/movemail # Confirm movemail don't setgid mkdir -p %{buildroot}%{site_lisp} -install -p -m 0644 %SOURCE3 %{buildroot}%{_datadir}/emacs/site-lisp/site-start.el -install -p -m 0644 %SOURCE4 %{buildroot}%{_datadir}/emacs/site-lisp +install -p -m 0644 %SOURCE1 %{buildroot}%{_datadir}/emacs/site-lisp/site-start.el +install -p -m 0644 %SOURCE2 %{buildroot}%{_datadir}/emacs/site-lisp echo "(setq source-directory \"%{_datadir}/emacs/%{version}/\")" >> %{buildroot}%{_datadir}/emacs/site-lisp/site-start.el @@ -262,27 +259,27 @@ install -d %{buildroot}/%{_datadir}/pkgconfig install -p -m 0644 emacs.pc %{buildroot}/%{_datadir}/pkgconfig mkdir -p %{buildroot}/%{_datadir}/appdata -cp -a %SOURCE10 %{buildroot}/%{_datadir}/appdata +cp -a %SOURCE8 %{buildroot}/%{_datadir}/appdata rm %{buildroot}/%{_datadir}/metainfo/emacs.appdata.xml install -d %{buildroot}%{_rpmconfigdir}/macros.d install -p -m 0644 macros.emacs %{buildroot}%{_rpmconfigdir}/macros.d/ -install -p -m 755 %SOURCE6 %{buildroot}/%{_bindir}/emacs-terminal +install -p -m 755 %SOURCE4 %{buildroot}/%{_bindir}/emacs-terminal rm -f %{buildroot}%{_infodir}/dir install -d %{buildroot}%{_userunitdir} -install -p -m 0644 %SOURCE7 %{buildroot}%{_userunitdir}/emacs.service +install -p -m 0644 %SOURCE5 %{buildroot}%{_userunitdir}/emacs.service # Emacs 26.1 don't installs the upstream unit file to /usr/lib64 on 64bit archs. rm -f %{buildroot}/usr/lib64/systemd/user/emacs.service mkdir -p %{buildroot}%{_datadir}/applications desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ - %SOURCE8 + %SOURCE6 desktop-file-install --dir=%{buildroot}%{_datadir}/applications \ - %SOURCE9 + %SOURCE7 rm -f *-filelist {common,el}-*-files @@ -344,7 +341,6 @@ fi %license etc/COPYING %attr(0755,-,-) %ghost %{_bindir}/emacs %{_bindir}/emacs-%{version} -%{_bindir}/emacs-%{version}.pdmp %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/icons/hicolor/* %{_datadir}/applications/emacs.desktop @@ -358,7 +354,6 @@ fi %attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs-lucid %{_bindir}/emacs-%{version}-lucid -%{_bindir}/emacs-%{version}-lucid.pdmp %endif %files nox @@ -366,7 +361,6 @@ fi %attr(0755,-,-) %ghost %{_bindir}/emacs %attr(0755,-,-) %ghost %{_bindir}/emacs-nox %{_bindir}/emacs-%{version}-nox -%{_bindir}/emacs-%{version}-nox.pdmp %files common -f common-filelist -f el-filelist %defattr(-,root,root) @@ -404,6 +398,9 @@ fi %{_infodir}/* %changelog +* Wed Dec 16 2020 jinzhimin - 1:27.1-3 +- fix emacs run failed + * Wed Sep 23 2020 hanhui - 1:27.1-2 - Type:bugfix - ID:NA diff --git a/gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg b/gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg deleted file mode 100644 index 13088c682afff60280738836bdb06f7ac02ee4da..0000000000000000000000000000000000000000 --- a/gpgkey-D405AA2C862C54F17EEE6BE0E8BCD7866AFCF978.gpg +++ /dev/null @@ -1,91 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBE/UA7cBCADWKKjxDivnNJhYYFcxPj/441aBG+MnoSEILupVIiIWN6RyRmiQ -pLHi3/05VZY4ngWMr4HX0a0iGnhfmljlAzerTfY//Puz7EYrN7EBMlm/abqsELXa -LWsxGcimRQGv0IIyZEgzmkFhu1F5e4r1BflBuqh5V6Y5s/SuA74xRvolyW2uliET -AiYGsO3zgY8j1ky4rU0TJhxGIl89WYPD0kzHji66zx9AxdWZ+EO4XtSuvbDghnxM -DMHLj+HDV+Ytl64arTp05WHoepAowKFpCBCPupgPk5+ss76wU5og+kG0DLBkctCL -Eywu0M1K08j5oVBSnOIqI71/yTV3cgCMRDNHABEBAAG0H05pY29sYXMgUGV0dG9u -IDxuaWNvQHBldHRvbi5mcj6JAU4EEwEIADgWIQQo077YUf3zq1f++TwjNYekfCB5 -EAUCXYf1oAIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRAjNYekfCB5EN+K -B/9W2UAElDBuBqiaCQ39n9M3/MIovCYM95/0fI+ucmUWEl3nY/ShT8LUPYtTEQn4 -xXUVC5Q64nG/h1t6F/NVDIC3Jgmrv4Zz5tkVrCDL2n7NIXO1SVbGEsgndM14bM5o -WDyT8pdIlAhJEPMfRPJOayFlzasnIfaekjiO8xIBeRmPo6arGrJc+YKPbFs7Y1G0 -9XI5U5ctKA79qVQpqr0oiX1CU7nimbUC8LlWX9CohmF8mJkC9dp2YvoYLQrJTSMe -vik/nm7vQJ96d0OsUXyLd432JakpjWNdfg+GlMu/KCrepYfVd9jS1AgyAP5IeRKa -j+mFmpJZKhdR748xG61fEwqwtCJOaWNvbGFzIFBldHRvbiA8bmljb2xhc0BwZXR0 -b24uZnI+iQE7BBMBAgAlAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCVXWB -zgIZAQAKCRAjNYekfCB5EBwACADDMA3E8hr6NF1mcFaPgDITqg8NztMr6VePYvkh -spuKkdGJOVerDlotHqSTUtc91Av2LXKLfmsiXqUQNpTFGIHvNIw9rSqT6m0Dxsjt -nxliCUj5UMoQk+qadnksJLo8sTTEcA7TB2WukII7QbsRfWi/mWxDH/uspzStJ3TC -HZJZ16rKjhtq/OvYBSrjcWKvRfpAyB4kw6OxAoVvd9wgyYYd+OlfIca6AFdAUyQA -TMbX6wpwO83FOWpk/hDY0ECEVHf/xCefx4mIVWWwPWQVYbJq5153jl88Hgbr/Of9 -5SM6qUnilkdhP2XhF47n2qwR+kxRGzRXoUWL4LnP8MfvBldVtClOaWNvbGFzIFBl -dHRvbiA8cGV0dG9uLm5pY29sYXNAZ21haWwuY29tPokBOAQTAQIAIgIbAwYLCQgH -AwIGFQgCCQoLBBYCAwECHgECF4AFAlV1gcUACgkQIzWHpHwgeRAxSAf/SLhYbU35 -2JVOHO1DRLTd/FcM44g2vZb9Nd5YOn8LIfcBsWs9LM3luGn7Boiyhj7z8K2z8xCc -c0lL8kNmWqIuMANRePlcMg2D/awgh3w6j57v0wWqJmNI3M6pahQMx9jUJ1xKyH+z -Ig10XLxavHcy4Hg7ELLT7IfqeT+SU5Ej732iNS0ruxYjZzFQgyYgTmnaLZ5LXEYY -KOcTJj1O/ZjENBxVgVZFgv5XZYEHB/GmmGhOP5V6g8ysd3vqw+RjoJpShbJL7mY8 -wfMcpGJAbNHUYko5Om4xF1BQCYBXcP4Vmhjj1Ko4nMZeOiLMEcdYb187+1NHCYHJ -+mPYiB/Fi3KNn7QrTmljb2xhcyBQZXR0b24gPG5pY29sYXNAZm9yZXRhZ3NwbGF0 -c2VuLnNlPokBOAQTAQIAIgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlV1 -gc4ACgkQIzWHpHwgeRABvQf/QG0arguyPqiUaAtOcWGqxfW+5GMtYXD+Oz8r0S1B -4Y1M7fQCaWjb/cvFEtX5mRpyuBwOmhJar8L94ikKCOa/wLd2cwplF0S+0Kup2xEC -w+EIPPJrQar0t7tq5JC5Ujhi3txzaLBylJBEBf/mNpb0div3Maaibbt1n+/KHLeg -ST10WRnI//CRM4b/ncCS3pNisO0F+y4VQ5wPar8DOIj/rNC1CsvrwehUxZ1O43OC -qNpRu2PefaPAnyAL+sa3YWdAXYlQJJH6k9qrPRgMvciCf3BCjlhjyP19e3tMxO4T -ReGD+yB5Em6XoTSOm4TGPbUdkjxayttPjWG0M4eO3iQ4sbQxTmljb2xhcyBQZXR0 -b24gPG5pY29sYXMucGV0dG9uQHdvbHRlcnNrbHV3ZXIuY29tPokBTgQTAQgAOBYh -BCjTvthR/fOrV/75PCM1h6R8IHkQBQJcRxtiAhsDBQsJCAcCBhUKCQgLAgQWAgMB -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 -=/cmd ------END PGP PUBLIC KEY BLOCK-----