From da7b3d6824e0352545941dfd7d5255aa734e08fcb2745b5173a1b6bb91fdb64e Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 12 Oct 2023 07:00:20 +0000
Subject: [PATCH 1/2] Accepting request 1117087 from
 home:Thaodan:branches:editors

- Don't install gsettings schemas twice

OBS-URL: https://build.opensuse.org/request/show/1117087
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=370
---
 emacs.changes | 5 +++++
 emacs.spec    | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/emacs.changes b/emacs.changes
index 690e6ed..7652d75 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct 11 13:16:41 UTC 2023 - Björn Bidar <bjorn.bidar@thaodan.de>
+
+- Don't install gsettings schemas twice
+
 -------------------------------------------------------------------
 Tue Oct 10 11:36:25 UTC 2023 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/emacs.spec b/emacs.spec
index ffe6798..8014b12 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -767,6 +767,9 @@ ln -sf %{_sysconfdir}/alternatives/ctags.1%{ext_man}	%{buildroot}%{_mandir}/man1
 
 install -Dm644 %{SOURCE9} %{buildroot}%{_rpmmacrodir}/macros.emacs
 
+# Workaround for gschema schemas being installed twice
+rm %{buildroot}%{_datadir}/emacs/%{version}/etc/org.gnu.emacs.defaults.gschema.*
+
 %if %{with nativecomp}
 touch eln.list
 for eln in %{buildroot}%{_libdir}/emacs/%{version}/native-lisp/%{version}-*/*.eln
@@ -1032,7 +1035,6 @@ fi
 %{_datadir}/emacs/%{version}/etc/charsets/symbol.map
 %{_datadir}/emacs/%{version}/etc/compilation.txt
 %{_datadir}/emacs/%{version}/etc/emacs_lldb.py
-%{_datadir}/emacs/%{version}/etc/org.gnu.emacs.defaults.gschema.*
 %dir %{_datadir}/emacs/%{version}/etc/org/
 %dir %{_datadir}/emacs/%{version}/etc/org/csl/
 %{_datadir}/emacs/%{version}/etc/org/csl/README

From fe89dcdff26f688ac4b55d4ecc9f9ad08dece19e8f3a5d7f5fe4a02feb5c82ff Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 12 Oct 2023 07:02:19 +0000
Subject: [PATCH 2/2] .

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=371
---
 emacs.changes | 5 +++++
 emacs.spec    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/emacs.changes b/emacs.changes
index 7652d75..0f422d6 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 12 07:01:56 UTC 2023 - Dr. Werner Fink <werner@suse.de>
+
+- Only recommend at-spi2-core 
+
 -------------------------------------------------------------------
 Wed Oct 11 13:16:41 UTC 2023 - Björn Bidar <bjorn.bidar@thaodan.de>
 
diff --git a/emacs.spec b/emacs.spec
index 8014b12..2b742db 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -256,7 +256,7 @@ Requires:       emacs = %{version}-%{release}
 Requires:       emacs-eln = %{version}-%{release}
 %endif
 Provides:       emacs_program = %{version}-%{release}
-Requires:       at-spi2-core
+Recommends:     at-spi2-core
 Requires:       gnu-unifont-bitmap-fonts
 Requires:       ifnteuro
 Requires:       xorg-x11-fonts