diff --git a/emacs-deal-taboo-words.patch b/emacs-deal-taboo-words.patch new file mode 100644 index 0000000000000000000000000000000000000000..c2f5d91e345c4240b8d626199618de99c804a323 --- /dev/null +++ b/emacs-deal-taboo-words.patch @@ -0,0 +1,41 @@ +From 771140a936b4cadf793e42c6637c5d7ec44b4d03 Mon Sep 17 00:00:00 2001 +From: WWX930846 <> +Date: Fri, 25 Mar 2022 14:53:15 +0800 +Subject: [PATCH] emacs-deal-taboo-words.patch + +--- + etc/publicsuffix.txt | 4 ---- + lisp/mail/mail-extr.el | 1 - + 2 files changed, 5 deletions(-) + +diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt +index ee0269c..b8652be 100644 +--- a/etc/publicsuffix.txt ++++ b/etc/publicsuffix.txt +@@ -6164,11 +6164,7 @@ mil.tr + k12.tr + edu.tr + kep.tr +- +-// Used by Northern Cyprus + nc.tr +- +-// Used by government agencies of Northern Cyprus + gov.nc.tr + + // travel : http://en.wikipedia.org/wiki/.travel +diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el +index f1a455d..077774e 100644 +--- a/lisp/mail/mail-extr.el ++++ b/lisp/mail/mail-extr.el +@@ -1932,7 +1932,6 @@ place. It affects how `mail-extract-address-components' works." + ("ec" "Ecuador" "The Republic of %s") + ("ee" "Estonia") + ("eg" "Egypt" "The Arab Republic of %s") +- ("eh" "Western Sahara") + ("er" "Eritrea") + ("es" "Spain" "The Kingdom of %s") + ("et" "Ethiopia") +-- +2.27.0 + diff --git a/emacs.spec b/emacs.spec index 6fe8250422afa988131422009f344095d890583b..91f0cb8a9a785f3352a7dcf6fd21c1762f202170 100644 --- a/emacs.spec +++ b/emacs.spec @@ -4,7 +4,7 @@ Name: emacs Epoch: 1 Version: 27.1 -Release: 6 +Release: 7 Summary: An extensible GNU text editor License: GPLv3+ and CC0-1.0 URL: http://www.gnu.org/software/emacs @@ -21,6 +21,8 @@ Source8: %{name}.appdata.xml Patch1: emacs-spellchecker.patch Patch2: emacs-system-crypto-policies.patch +Patch9000: emacs-deal-taboo-words.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 BuildRequires: libxml2-devel bzip2 cairo texinfo gzip desktop-file-utils libacl-devel libtiff-devel @@ -397,6 +399,9 @@ fi %{_mandir}/*/* %changelog +* Fri Mar 25 2022 xingxing - 1:27.1-7 +- round self-developed-patch + * Mon Aug 9 2021 yangcheng - 1:27.1-6 - fixed the upgrade error caused by the info file in the emacs-common software package being repackaged