[xemacs] Update location of rpm macro file for rpm >= 4.11.

[Jerry James]

commit 9a9ae93a7321f138c3cc0b2f9cd72d0f0f92ba1c
Author: Jerry James <jamesjer at betterlinux.com>
Date:   Wed Feb 5 11:27:16 2014 -0700

    Update location of rpm macro file for rpm >= 4.11.
    
    Disable XIM by default.  It hasn't worked since the release of Fedora
    19 due to a fixed size buffer inside libX11 that is too small (see
    _XimProtoCreateIC in modules/im/ximcp/imDefIc.c), and nobody has
    complained.

 xemacs.spec |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/xemacs.spec b/xemacs.spec
index 8a76cbc..8b6b651 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -6,9 +6,9 @@
 %bcond_with     wnn
 %bcond_with     xaw3d
 %bcond_with     xfs
+%bcond_with     xim
 %bcond_without  mule
 %bcond_without  nox
-%bcond_without  xim
 %ifarch ia64
 # no-expdyn-ia64 patch, https://bugzilla.redhat.com/show_bug.cgi?id=106744#c39
 %bcond_with     modules
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.34
-Release:        4%{?snap:.%{snap}}%{?dist}
+Release:        5%{?snap:.%{snap}}%{?dist}
 Summary:        Different version of Emacs
 
 %global majver %(cut -d. -f1-2 <<<%{version})
@@ -467,7 +467,7 @@ install -Dpm 644 %{SOURCE1} \
     $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 
 # macro file
-install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.xemacs
+install -Dpm 644 macros.xemacs $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.%{name}
 
 # Empty directories for external packages to use
 mkdir -m 0755 $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/etc
@@ -624,7 +624,7 @@ fi
 %dir %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/
 %{_libdir}/xemacs-%{xver}/%{xbuild}/modules/auto-autoloads.elc
 %endif
-%config(noreplace) %{_sysconfdir}/rpm/macros.xemacs
+%{_rpmconfigdir}/macros.d/macros.%{name}
 %config(noreplace) %{_sysconfdir}/skel/.xemacs/
 %{_mandir}/man1/etags.xemacs.1*
 %{_mandir}/man1/gnuserv.1*
@@ -659,6 +659,12 @@ fi
 %dir %{_datadir}/xemacs/site-packages/pkginfo
 
 %changelog
+* Wed Feb  5 2014 Jerry James <loganjerry at gmail.com> - 21.5.34-5
+- Disable XIM by default.  It hasn't worked since the release of Fedora 19 due
+  to a fixed size buffer inside libX11 that is too small (see _XimProtoCreateIC
+  in modules/im/ximcp/imDefIc.c), and nobody has complained.
+- Update location of rpm macro file for rpm >= 4.11
+
 * Tue Nov 12 2013 Jerry James <loganjerry at gmail.com> - 21.5.34-4
 - Add an AppData file