From 1f360fae007739186f98405418742900b527e3114091a3ec2adecee5257a4773 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Thu, 15 Mar 2012 09:15:51 +0000
Subject: [PATCH] Accepting request 109242 from home:msmeissn:branches:editors

fix build on factory

OBS-URL: https://build.opensuse.org/request/show/109242
OBS-URL: https://build.opensuse.org/package/show/editors/emacs?expand=0&rev=72
---
 emacs.changes |  5 +++++
 emacs.spec    | 48 ++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/emacs.changes b/emacs.changes
index 338b4c9..c0e0d28 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 14 10:31:33 CET 2012 - meissner@suse.de
+
+- add %dir /usr/share/X11/app-defaults to fix factory build.
+
 -------------------------------------------------------------------
 Tue Jan 10 14:53:41 UTC 2012 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 3db6aea..bb7b141 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 Name:           emacs
 BuildRequires:  alsa-devel
 BuildRequires:  autoconf
@@ -49,11 +50,24 @@ BuildRequires:  gpm
 Url:            http://www.gnu.org/software/emacs/
 Version:        23.3
 Release:        0
-Obsoletes:      ge_exec ge_site emacmisc emacsger emacs-url Mule-UCS emacs-calc erc
+Obsoletes:      Mule-UCS
+Obsoletes:      emacmisc
+Obsoletes:      emacs-calc
+Obsoletes:      emacs-url
+Obsoletes:      emacsger
+Obsoletes:      erc
+Obsoletes:      ge_exec
+Obsoletes:      ge_site
+Requires:       ctags
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
-Requires:       ctags
-Provides:       ge_site ge_exec emacs-url Mule-UCS emacs-calc erc emacmisc
+Provides:       Mule-UCS
+Provides:       emacmisc
+Provides:       emacs-calc
+Provides:       emacs-url
+Provides:       erc
+Provides:       ge_exec
+Provides:       ge_site
 Summary:        GNU Emacs Base Package
 License:        GPL-2.0+
 Group:          Productivity/Editors/Emacs
@@ -90,13 +104,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define _x11data    %{_exec_prefix}/lib/X11
 %define _libx11     %{_x11data}
 %define _x11inc     %{_exec_prefix}/include
-%define appDefaultsFile %{_x11data}/app-defaults/Emacs
+%define appDefaultsDir %{_x11data}/app-defaults
+%define appDefaultsFile %{appDefaultsDir}/Emacs
 %else
 %define _x11lib     %{_libdir}
 %define _x11data    %{_datadir}/X11
 %define _libx11     %{_exec_prefix}/lib/X11
 %define _x11inc     %{_includedir}
-%define appDefaultsFile %{_x11data}/app-defaults/Emacs
+%define appDefaultsDir %{_x11data}/app-defaults
+%define appDefaultsFile %{appDefaultsDir}/Emacs
 %endif
 %define info_files  elisp emacs eintr ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse ede ediff edt eieio emacs-mime epa erc eshell eudc efaq flymake forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc remember reftex sasl sc semantic ses sieve smtpmail speedbar tramp url vip viper widget woman
 
@@ -108,7 +124,8 @@ emacs-nox.
 PreReq:         fileutils
 Obsoletes:      emac_nox
 Requires:       emacs = %{version}-%{release}
-Provides:       emacs_program = %{version}-%{release}, emac_nox
+Provides:       emac_nox
+Provides:       emacs_program = %{version}-%{release}
 Summary:        GNU Emacs-nox: An Emacs Binary without X Window System Support
 Group:          Productivity/Editors/Emacs
 
@@ -124,8 +141,10 @@ PreReq:         fileutils
 Obsoletes:      emacsbin
 Requires:       emacs = %{version}-%{release}
 Enhances:       xorg-x11-libs
-Provides:       emacs_program = %{version}-%{release} emacsbin
-Provides:       emacs:/usr/bin/emacs ge_exec:/usr/bin/emacs
+Provides:       emacs:/usr/bin/emacs
+Provides:       emacs_program = %{version}-%{release}
+Provides:       emacsbin
+Provides:       ge_exec:/usr/bin/emacs
 Summary:        GNU Emacs: Emacs binary with X Window System Support
 Group:          Productivity/Editors/Emacs
 
@@ -152,8 +171,16 @@ Several Lisp files not needed for running GNU Emacs. Most of these
 files are pre-byte compiled and therefore not necessary.
 
 %package     -n emacs-info
-Obsoletes:      ge_info elispman elisp-manual elispint emacs-lisp-intro
-Provides:       elispman elisp-manual elispint emacs-lisp-intro ge_info
+Obsoletes:      elisp-manual
+Obsoletes:      elispint
+Obsoletes:      elispman
+Obsoletes:      emacs-lisp-intro
+Obsoletes:      ge_info
+Provides:       elisp-manual
+Provides:       elispint
+Provides:       elispman
+Provides:       emacs-lisp-intro
+Provides:       ge_info
 Summary:        Info files for GNU Emacs
 Group:          Productivity/Editors/Emacs
 PreReq:         %install_info_prereq
@@ -2889,6 +2916,7 @@ done
 %defattr(-, root, root)
 %{_bindir}/emacs-x11
 %{_bindir}/emacs-gtk
+%dir %{appDefaultsDir}
 %{appDefaultsFile}
 %{_datadir}/applications/emacs.desktop
 %{_datadir}/pixmaps/emacs.png