From 6676828b422c570c5d65d54e4443a5cb28af9fa4 Mon Sep 17 00:00:00 2001
From: Jerry James <loganjerry@gmail.com>
Date: Mar 25 2019 01:42:01 +0000
Subject: Merge -(x)emacs-el subpackages into -(x)emacs.


---

diff --git a/gcl.spec b/gcl.spec
index c10de1a..e5a3325 100644
--- a/gcl.spec
+++ b/gcl.spec
@@ -211,35 +211,26 @@ Requires:       %{name} = %{version}-%{release}
 Requires:       emacs(bin) >= %{_emacs_version}
 BuildArch:      noarch
 
+# This can be removed when Fedora 29 reaches EOL
+Obsoletes:      %{name}-emacs-el < 2.6.13
+Provides:       %{name}-emacs-el = %{version}-%{release}
+
 %description emacs
 Emacs mode for interacting with GCL
 
-%package emacs-el
-Summary:        Source for Emacs mode for interacting with GCL
-Requires:       %{name}-emacs = %{version}-%{release}
-BuildArch:      noarch
-
-%description emacs-el
-Source Elisp code for Emacs mode for interacting with GCL
-
-
 %package xemacs
 Summary:        XEmacs mode for interacting with GCL
 Requires:       %{name} = %{version}-%{release}
 Requires:       xemacs(bin) >= %{_xemacs_version}, xemacs-packages-extra
 BuildArch:      noarch
 
+# This can be removed when Fedora 29 reaches EOL
+Obsoletes:      %{name}-xemacs-el < 2.6.13
+Provides:       %{name}-xemacs-el = %{version}-%{release}
+
 %description xemacs
 XEmacs mode for interacting with GCL
 
-%package xemacs-el
-Summary:        Source for XEmacs mode for interacting with GCL
-Requires:       %{name}-xemacs = %{version}-%{release}
-BuildArch:      noarch
-
-%description xemacs-el
-Source Elisp code for XEmacs mode for interacting with GCL
-
 
 %package selinux
 Summary:        SELinux policy for GCL images
@@ -502,22 +493,14 @@ fi
 
 %files emacs
 %doc elisp/readme
-%dir %{_emacs_sitelispdir}/gcl
-%{_emacs_sitelispdir}/gcl/*.elc
+%{_emacs_sitelispdir}/gcl/
 %{_emacs_sitestartdir}/*
 
-%files emacs-el
-%{_emacs_sitelispdir}/gcl/*.el
-
 %files xemacs
 %doc elisp/readme
-%dir %{_xemacs_sitelispdir}/gcl
-%{_xemacs_sitelispdir}/gcl/*.elc
+%{_xemacs_sitelispdir}/gcl/
 %{_xemacs_sitestartdir}/*
 
-%files xemacs-el
-%{_xemacs_sitelispdir}/gcl/*.el
-
 %files selinux
 %license COPYING*
 %{_datadir}/selinux/packages/gcl.pp.bz2
@@ -525,6 +508,9 @@ fi
 
 
 %changelog
+* Sat Mar 23 2019 Jerry James <loganjerry@gmail.com> - 2.6.13-0.79.2
+- Merge -(x)emacs-el subpackages into -(x)emacs
+
 * Sun Feb 17 2019 Jerry James <loganjerry@gmail.com> - 2.6.13-0.79.2
 - Drop the -largefile patch, causing crashes