round self-developed patch

(cherry picked from commit e7d22f1754481c86f3cb78c0b8c5907c1af590b6)
This commit is contained in:
liuyumeng 2022-01-17 16:25:12 +08:00 committed by openeuler-sync-bot
parent 80e9456060
commit 265b906e7a
2 changed files with 44 additions and 1 deletions

View File

@ -0,0 +1,39 @@
From 2b98d49b72e801109de870672bc071361a9b6a1b Mon Sep 17 00:00:00 2001
From: yeah_wang <wangye70@huawei.com>
Date: Thu, 8 Apr 2021 16:07:05 +0800
Subject: [PATCH] emacs-deal-taboo-words
---
etc/publicsuffix.txt | 2 --
lisp/mail/mail-extr.el | 1 -
2 files changed, 3 deletions(-)
diff --git a/etc/publicsuffix.txt b/etc/publicsuffix.txt
index 1ede2b9..c38649f 100644
--- a/etc/publicsuffix.txt
+++ b/etc/publicsuffix.txt
@@ -6259,9 +6259,7 @@ tel.tr
tsk.tr
tv.tr
web.tr
-// Used by Northern Cyprus
nc.tr
-// Used by government agencies of Northern Cyprus
gov.nc.tr
// tt : http://www.nic.tt/
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 11918aa..f2d7fae 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.23.0

View File

@ -4,7 +4,7 @@
Name: emacs
Epoch: 1
Version: 27.2
Release: 3
Release: 4
Summary: An extensible GNU text editor
License: GPLv3+ and CC0-1.0
URL: http://www.gnu.org/software/emacs
@ -21,6 +21,7 @@ Source8: %{name}.appdata.xml
Patch6001: emacs-spellchecker.patch
Patch6002: emacs-system-crypto-policies.patch
Patch6003: backport-emacs-glibc-2.34.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
@ -398,6 +399,9 @@ fi
%{_mandir}/*/*
%changelog
* Mon Jan 17 2022 liuyumeng <liuyumeng5@huawei.com> - 1:27.2-4
- round self-developed patch
* Tue Aug 10 2021 yangcheng <yangcheng87@huawei.com> - 1:27.2-3
- DESC: Fix the upgrade error caused by the info file in the emacs-help software package being repackaged