!8 version update

Merge pull request !8 from yeah_wang/master

emacs-terminal.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Emacs Terminal
+GenericName=Emacs Terminal
+Comment=Emacs Terminal Mode
+Exec=emacs-terminal
+Icon=utilities-terminal
+Type=Application
+Terminal=false
+Categories=Application;Utility;X-Red-Hat-Base;GTK;TerminalEmulator;
+Encoding=UTF-8
+StartupWMClass=Emacs

emacs-terminal.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/emacs -Q --eval '(term "/bin/bash")'

emacs.appdata.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> -->
+<component type="desktop">
+  <id>emacs.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>GNU Emacs</name>
+  <summary>Edit text files, view pictures and binary files</summary>
+  <description>
+    <p>
+      Emacs is a powerful, customizable, self-documenting, modeless
+      editor. It is used primarely to edit text, including text
+      documents, source code of programs, web pages and XML documents,
+      but can also be used to display and edit binary files.
+    </p>
+    <p>
+      Emacs allows efficient editing of text with shortcuts which
+      allow operating on letters, words, sentences, and paragraphs as
+      single units. This includes both moving around and operations
+      like copying, deleting, transposing, and pasting. Macros can be
+      conveniently defined to repeat sequences of commands. In
+      addition, Emacs is (partially) built in a scripting language
+      (elisp) which can also be used to define further functions
+      extending existing capabilities.
+    </p>
+    <p>
+      Emacs has extensive support for editing source code, including
+      programmable syntax highlighting, automatic indentation, source
+      code indexing, overview modes, and navigation based on language
+      specific units like functions and blocks. It is also possible to
+      invoke the compiler from within Emacs and easily move between
+      compiler output and corresponding positions in the source.
+    </p>
+    <p>
+      Emacs has multiple modules which provide further functionality.
+      This provides the capability to read mail, news, browse
+      pictures, read man and info pages, browse the web, execute
+      arbitrary programs, and more, without leaving the editor.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot type="default" height="888" width="1595">
+      <image>http://in.waw.pl/~zbyszek/fedora/emacs-two-buffers.png</image>
+    </screenshot>
+    <screenshot height="667" width="1199">
+      <image>http://in.waw.pl/~zbyszek/fedora/emacs-editing-xml.png</image>
+    </screenshot>
+    <screenshot height="572" width="1019">
+      <image>http://in.waw.pl/~zbyszek/fedora/emacs-hexl-mode.png</image>
+    </screenshot>
+    <screenshot height="667" width="1199">
+      <image>http://in.waw.pl/~zbyszek/fedora/emacs-showing-svg.png</image>
+    </screenshot>
+    <screenshot height="439" width="794">
+      <image>http://in.waw.pl/~zbyszek/fedora/emacs-with-python-source.png</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">http://www.gnu.org/software/emacs/</url>
+  <url type="bugtracker">https://www.gnu.org/software/emacs/manual/html_node/emacs/Bugs.html</url>
+  <url type="donation">https://my.fsf.org/donate/</url>
+  <url type="help">https://www.gnu.org/software/emacs/manual/</url>
+  <update_contact>zbyszek@in.waw.pl</update_contact>
+  <translation/>
+</component>

emacs.desktop

@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=Emacs
+GenericName=Text Editor
+Comment=Edit text
+Comment[zh_TW]=編輯文字
+MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
+Exec=emacs %f
+Icon=emacs
+Type=Application
+Terminal=false
+Categories=Utility;TextEditor;X-Red-Hat-Base;
+StartupWMClass=Emacs

emacs.spec

@@ -3,19 +3,22 @@
 
 Name:          emacs
 Epoch:         1
-Version:       26.1
+Version:       26.3
-Release:       12
+Release:       1
 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
-Source3:       site-start.el
+Source1:       site-start.el
+Source2:       emacs.service
+Source3:       emacs.desktop
 Source4:       default.el
-Source7:       emacs.service
+Source7:       emacs-terminal.desktop
+Source8:       emacs-terminal.sh
+Source10:      %{name}.appdata.xml
 
 Patch1:        emacs-spellchecker.patch
 Patch2:        emacs-system-crypto-policies.patch
-Patch3:        emacs-xft-color-font-crash.patch
 
 BuildRequires: gcc atk-devel cairo-devel freetype-devel fontconfig-devel dbus-devel giflib-devel
 BuildRequires: glibc-devel zlib-devel gnutls-devel libselinux-devel GConf2-devel alsa-lib-devel
@@ -23,13 +26,9 @@ BuildRequires: libxml2-devel bzip2 cairo texinfo gzip desktop-file-utils libacl-
 BuildRequires: libpng-devel libjpeg-turbo-devel libjpeg-turbo ncurses-devel gpm-devel libX11-devel
 BuildRequires: libXau-devel libXdmcp-devel libXrender-devel libXt-devel libXpm-devel gtk3-devel
 BuildRequires: xorg-x11-proto-devel webkit2gtk3-devel librsvg2-devel
-
+BuildRequires: libotf-devel ImageMagick-devel m17n-lib-devel liblockfile-devel
-%if !%{with bootstrap}
-#BuildRequires: libotf-devel ImageMagick-devel m17n-lib-devel liblockfile-devel
-
 # For lucid
 BuildRequires: Xaw3d-devel
-%endif
 
 %ifarch %{ix86}
 BuildRequires: util-linux
@@ -54,6 +53,12 @@ At its core is an interpreter for Emacs Lisp, a dialect of the Lisp programming
 with extensions to support text editing. And it is an entire ecosystem of functionality beyond text editing,
 including a project planner, mail and news reader, debugger interface, calendar, and more.
 
+%package devel
+Summary: Development header files for emacs
+
+%description devel
+Development header files for emacs.
+
 %if !%{with bootstrap}
 %package       lucid
 Summary:       GNU Emacs text editor with LUCID toolkit X support
@@ -93,6 +98,14 @@ Obsoletes:     emacs-el < 1:24.3-29
 This package contains all the common files needed by emacs, emacs-lucid
 or emacs-nox.
 
+%package terminal
+Summary:       A desktop menu for GNU Emacs terminal.
+Requires:      emacs = %{epoch}:%{version}-%{release}
+BuildArch:     noarch
+
+%description   terminal
+Install emacs-terminal if you need a terminal with Malayalam support.
+
 %package       filesystem
 Summary:       Emacs filesystem layout
 BuildArch:     noarch
@@ -215,7 +228,7 @@ 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 %SOURCE1 %{buildroot}%{_datadir}/emacs/site-lisp/site-start.el
 install -p -m 0644 %SOURCE4 %{buildroot}%{_datadir}/emacs/site-lisp
 
 echo "(setq source-directory \"%{_datadir}/emacs/%{version}/\")" >> %{buildroot}%{_datadir}/emacs/site-lisp/site-start.el
@@ -237,17 +250,29 @@ install -d %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d
 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
+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 %SOURCE8 %{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 %SOURCE2 %{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 \
+                     %SOURCE3
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
+                     %SOURCE7
+
 rm -f *-filelist {common,el}-*-files
 
 ( TOPDIR=${PWD}
@@ -308,10 +333,13 @@ fi
 %license etc/COPYING
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %{_bindir}/emacs-%{version}
-%{_datadir}/appdata/*
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/icons/hicolor/*
 %{_datadir}/applications/emacs.desktop
 
+%files devel
+%{_includedir}/emacs-module.h
+
 %if !%{with bootstrap}
 %files        lucid
 %defattr(-,root,root)
@@ -345,6 +373,10 @@ fi
 %{_datadir}/emacs/%{version}/site-lisp
 %{_infodir}/*
 
+%files terminal
+%{_bindir}/emacs-terminal
+%{_datadir}/applications/emacs-terminal.desktop
+
 %files       filesystem
 %defattr(-,root,root)
 %dir %{_datadir}/emacs
@@ -358,6 +390,9 @@ fi
 %{_infodir}/*
 
 %changelog
+* Tue Jul 28 2020 wangye <wangye70@huawei.com> - 1:26.3-1
+- version update to 23.3
+
 * Fri Mar 13 2020 songnannan <songnannan2@huawei.com> - 1:26.1-12
 - add secure compile option