[emacs/f21] Resolves #1151652 Merge emacs-el into emacs-common

[Petr Hracek]

commit 21afb6f2f4fb4da0c193d1613a270f5899f47c7d
Author: Petr Hracek <phracek at redhat.com>
Date:   Fri Oct 24 13:02:20 2014 +0200

    Resolves #1151652 Merge emacs-el into emacs-common

 emacs.spec |   31 ++++++++++---------------------
 1 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/emacs.spec b/emacs.spec
index b747b50..0201e09 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 24.3
-Release: 27%{?dist}
+Release: 28%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -130,7 +130,9 @@ Requires(preun): /sbin/install-info
 Requires(preun): %{_sbindir}/alternatives
 Requires(posttrans): %{_sbindir}/alternatives
 Requires(post): /sbin/install-info
-Requires: %{name}-filesystem
+Requires: %{name}-filesystem = %{epoch}:%{version}-%{release}
+Provides: %{name}-el = %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-el <= 1:24.3-27
 
 %description common
 Emacs is a powerful, customizable, self-documenting, modeless text
@@ -140,19 +142,6 @@ without leaving the editor.
 
 This package contains all the common files needed by emacs or emacs-nox.
 
-%package el
-Summary: Lisp source files included with GNU Emacs
-Group: Applications/Editors
-Requires: %{name}-filesystem
-BuildArch: noarch
-
-%description el
-Emacs-el contains the emacs-elisp sources for many of the elisp
-programs included with the main Emacs text editor package.
-
-You need to install emacs-el only if you intend to modify any of the
-Emacs packages or see some elisp examples.
-
 %package terminal
 Summary: A desktop menu item for GNU Emacs terminal.
 Group: Applications/Editors
@@ -449,10 +438,10 @@ update-desktop-database &> /dev/null || :
 %attr(0755,-,-) %ghost %{_bindir}/emacs
 %attr(0755,-,-) %ghost %{_bindir}/emacs-nox
 
-%files -f common-filelist common
+%files common -f common-filelist -f el-filelist
 %config(noreplace) %{_sysconfdir}/skel/.emacs
 %{_rpmconfigdir}/macros.d/macros.emacs
-%doc doc/NEWS BUGS README doc/COPYING
+%doc doc/NEWS BUGS README doc/COPYING etc/COPYING
 %{_bindir}/ebrowse
 %{_bindir}/emacsclient
 %{_bindir}/etags.emacs
@@ -468,11 +457,7 @@ update-desktop-database &> /dev/null || :
 %{_userunitdir}/emacs.service
 %attr(0644,root,root) %config(noreplace) %{_datadir}/emacs/site-lisp/default.el
 %attr(0644,root,root) %config %{_datadir}/emacs/site-lisp/site-start.el
-
-%files -f el-filelist el
 %{pkgconfig}/emacs.pc
-%doc etc/COPYING
-%dir %{_datadir}/emacs/%{version}
 
 %files terminal
 %{_bindir}/emacs-terminal
@@ -484,6 +469,10 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Thu Oct 23 2014 Petr Hracek <phracek at redhat.com> - 1:24.3-28
+- resolves: #1151652
+  emacs-el files are part of emacs-common
+
 * Tue Sep 30 2014 jchaloup <jchaloup at redhat.com> - 1:24.3-27
 - resolves: #1147912
   Service dont start. Must be replace: "Type=Forking" > "Type=forking".