From ae167c338c9e01f64fdaa855ea6bbd5a5b8c7e1a5bb0e3ff2dfa97431d6cf31b Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 29 Jun 2018 10:09:46 +0000
Subject: [PATCH] mailutils

OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=253
---
 emacs.spec | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/emacs.spec b/emacs.spec
index e107a63..a2c69ba 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -16,10 +16,9 @@
 #
 
 
-%bcond_with     autoconf
 %bcond_without  autoconf
 # Once mailutils is in Factory change this to bcond_without
-%bcond_with     mailutils
+%bcond_without  mailutils
 # Experimental, not for production (see https://www.gnu.org/software/emacs/news/NEWS.25.2)
 %bcond_with     cairo
 
@@ -57,6 +56,7 @@ BuildRequires:  libudev-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  m17n-lib-devel
 %if %{with mailutils}
+BuildRequires:  mailutils
 BuildRequires:  mailutils-devel
 %endif
 BuildRequires:  makeinfo
@@ -95,9 +95,6 @@ BuildRequires:  pkgconfig(xxf86vm)
 Url:            http://www.gnu.org/software/emacs/
 Version:        26.1
 Release:        0
-Requires:       emacs-info = %{version}
-Requires:       emacs_program = %{version}-%{release}
-Requires:       etags
 Summary:        GNU Emacs Base Package
 License:        GPL-3.0-or-later
 Group:          Productivity/Text/Editors
@@ -105,6 +102,12 @@ Provides:       nxml-mode = 20041004
 Obsoletes:      nxml-mode < 20041004
 Provides:       epg = 1.0.0
 Obsoletes:      epg < 1.0.0
+Requires:       emacs-info = %{version}
+Requires:       emacs_program = %{version}-%{release}
+Requires:       etags
+%if %{with mailutils}
+Requires:       mailutils
+%endif
 Requires(pre):  fileutils
 Requires(pre):  group(games)
 Requires(pre):  user(games)
@@ -130,6 +133,7 @@ Patch23:        emacs-25.1-custom-fonts.patch
 # but that is because we ship /usr/include/ImageMagick-7/wand compat
 # symlink
 Patch24:        emacs-25.2-ImageMagick7.patch
+Patch25:        emacs-26.1-xft4x11.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{expand: %%global include_info %(test -s /usr/share/info/info.info* && echo 0 || echo 1)}
@@ -236,6 +240,7 @@ and most assembler-like syntaxes.
 %patch16 -p0 -b .flyspell
 %patch23 -p0 -b .custfnt
 %patch24 -p1 -b .imag
+%patch25 -p0 -b .xft
 %patch   -p0 -b .0
 
 %build