diff --git a/README.en.md b/README.en.md deleted file mode 100644 index e200f611353b5c0dbcc7cf26305d1bc0e85dbcab..0000000000000000000000000000000000000000 --- a/README.en.md +++ /dev/null @@ -1,36 +0,0 @@ -# emacs - -#### Description -{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**} - -#### Software Architecture -Software architecture description - -#### Installation - -1. xxxx -2. xxxx -3. xxxx - -#### Instructions - -1. xxxx -2. xxxx -3. xxxx - -#### Contribution - -1. Fork the repository -2. Create Feat_xxx branch -3. Commit your code -4. Create Pull Request - - -#### Gitee Feature - -1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md -2. Gitee blog [blog.gitee.com](https://blog.gitee.com) -3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore) -4. The most valuable open source project [GVP](https://gitee.com/gvp) -5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help) -6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/README.md b/README.md deleted file mode 100644 index 9336b688de991937413350c3118574759cf1abee..0000000000000000000000000000000000000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# emacs - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) diff --git a/dotemacs.el b/dotemacs.el deleted file mode 100644 index e1bee17a6b6b16c4ab851dac57dc9af63275f5ad..0000000000000000000000000000000000000000 --- a/dotemacs.el +++ /dev/null @@ -1,12 +0,0 @@ -;; .emacs - -(custom-set-variables - ;; uncomment to always end a file with a newline - ;'(require-final-newline t) - ;; uncomment to disable loading of "default.el" at startup - ;'(inhibit-default-init t) - ;; default to unified diffs - '(diff-switches "-u")) - -;;; uncomment for CJK utf-8 support for non-Asian users -;; (require 'un-define) diff --git a/emacs-spellchecker.patch b/emacs-spellchecker.patch deleted file mode 100644 index 48c2b57eff730ab9ad31414c9ea0ce3d1b1aeff9..0000000000000000000000000000000000000000 --- a/emacs-spellchecker.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el -index 1d28de7..1daec44 100644 ---- a/lisp/textmodes/ispell.el -+++ b/lisp/textmodes/ispell.el -@@ -200,9 +200,9 @@ - ;; cause an error; and one of the other spelling engines below is - ;; almost certainly installed in any case, for enchant to use. - (defcustom ispell-program-name -- (or (executable-find "aspell") -+ (or (executable-find "hunspell") -+ (executable-find "aspell") - (executable-find "ispell") -- (executable-find "hunspell") - "ispell") - "Program invoked by \\[ispell-word] and \\[ispell-region] commands." - :type 'string diff --git a/emacs-terminal.desktop b/emacs-terminal.desktop deleted file mode 100644 index 3c12470b9f1eacfd21ff2cde18392fb5aabbb908..0000000000000000000000000000000000000000 --- a/emacs-terminal.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[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 diff --git a/emacs-terminal.sh b/emacs-terminal.sh deleted file mode 100644 index bc0592a282a3f4d36a771bd7a9be7bd4a0024958..0000000000000000000000000000000000000000 --- a/emacs-terminal.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec /usr/bin/emacs -Q --eval '(term "/bin/bash")' diff --git a/emacs.desktop b/emacs.desktop deleted file mode 100644 index c71b4a83ba5f8525e9499065e7765de701a409ef..0000000000000000000000000000000000000000 --- a/emacs.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[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 diff --git a/emacs.spec b/emacs.spec index 429ed5f687cece1999fa0fdbb8bfb3ad3c6051d1..2a1ce357629d871e0aae41d4b1cc9039e4478235 100644 --- a/emacs.spec +++ b/emacs.spec @@ -1,26 +1,20 @@ %global _hardened_build 1 %bcond_with bootstrap -Name: emacs -Epoch: 1 -Version: 26.1 -Release: 10 -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: emacs.desktop -Source2: dotemacs.el -Source3: site-start.el -Source4: default.el -Source5: emacs-terminal.desktop -Source6: emacs-terminal.sh -Source7: emacs.service - -Patch1: emacs-spellchecker.patch -Patch2: emacs-system-crypto-policies.patch -Patch3: emacs-xft-color-font-crash.patch +Name: emacs +Epoch: 1 +Version: 26.1 +Release: 11 +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 +Source4: default.el +Source7: emacs.service + +Patch1: emacs-system-crypto-policies.patch +Patch2: 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 @@ -98,14 +92,6 @@ 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 item for GNU Emacs terminal. -Requires: emacs = %{epoch}:%{version}-%{release} -BuildArch: noarch - -%description terminal -A desktop menu item for GNU Emacs terminal. - %package filesystem Summary: Emacs filesystem layout BuildArch: noarch @@ -120,8 +106,6 @@ Emacs filesystem layout autoconf -cp %SOURCE1 etc/emacs.desktop - egrep -v "tetris.elc|pong.elc" lisp/Makefile.in > lisp/Makefile.in.new && mv lisp/Makefile.in.new lisp/Makefile.in rm -f lisp/play/tetris.el* lisp/play/pong.el* @@ -248,15 +232,11 @@ mv %{buildroot}%{_infodir}/info.info.gz %{buildroot}%{_infodir}/info.gz install -d %{buildroot}%{_datadir}/emacs/site-lisp/site-start.d -install -d %{buildroot}%{_sysconfdir}/skel -install -p -m 0644 %SOURCE2 %{buildroot}%{_sysconfdir}/skel/.emacs - install -d %{buildroot}/%{_datadir}/pkgconfig install -p -m 0644 emacs.pc %{buildroot}/%{_datadir}/pkgconfig 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 rm -f %{buildroot}%{_infodir}/dir @@ -266,10 +246,6 @@ install -p -m 0644 %SOURCE7 %{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 -install -d %{buildroot}%{_datadir}/applications -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %SOURCE1 -desktop-file-install --dir=%{buildroot}%{_datadir}/applications %SOURCE5 - rm -f *-filelist {common,el}-*-files ( TOPDIR=${PWD} @@ -281,7 +257,6 @@ rm -f *-filelist {common,el}-*-files sed -i -e "s|\.%{_prefix}|%{_prefix}|" *-files cat common-*-files > common-filelist cat el-*-files common-lisp-dir-files > el-filelist -rm %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/emacs-document23.svg %preun %{_sbindir}/alternatives --remove emacs %{_bindir}/emacs-%{version} @@ -354,7 +329,6 @@ fi %doc doc/NEWS BUGS README %license etc/COPYING %{_rpmconfigdir}/macros.d/macros.emacs -%config(noreplace) %{_sysconfdir}/skel/.emacs %attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el %{_bindir}/gctags @@ -369,11 +343,6 @@ fi %{_datadir}/emacs/%{version}/site-lisp %{_infodir}/* -%files terminal -%defattr(-,root,root) -%{_bindir}/emacs-terminal -%{_datadir}/applications/emacs-terminal.desktop - %files filesystem %defattr(-,root,root) %dir %{_datadir}/emacs @@ -387,6 +356,9 @@ fi %{_infodir}/* %changelog +* Sat Jan 11 2020 openEuler Buildteam - 1:26.1-11 +- remove unnecessary source + * Sat Dec 28 2019 openEuler Buildteam - 1:26.1-10 - Type:bugfix - ID:NA