From 3da61c149910fba59708751fb35837d704e70ae9 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos@fedoraproject.org>
Date: Mar 22 2020 19:23:53 +0000
Subject: also install el files in the package directory


---

diff --git a/emacs-common-ess.spec b/emacs-common-ess.spec
index 4a0d2d5..03ac339 100644
--- a/emacs-common-ess.spec
+++ b/emacs-common-ess.spec
@@ -5,7 +5,7 @@
 
 Name:           emacs-common-%{pkg}
 Version:        18.10.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{pkgname} add-on package for Emacs
 
 # The ess license is GPLV+2, the license of julia-mode.el is MIT
@@ -13,6 +13,9 @@ License:        GPLv2+ and MIT
 URL:            http://ess.r-project.org/
 Source0:        http://ess.r-project.org/downloads/ess/ess-%{version}%{plevel_appendix}.tgz
 
+# install el files (taken from upstream commit)
+Patch0:         ess-18.10.2-install_el_files.patch
+
 BuildArch:      noarch
 
 BuildRequires:  emacs
@@ -67,7 +70,7 @@ This package contains the documentation of %{pkgname}.
 
 
 %prep
-%setup -q -n %{pkg}-%{version}%{plevel_appendix}
+%autosetup -p1 -n %{pkg}-%{version}%{plevel_appendix}
 ( cd doc && chmod u+w html info ) # fix perms to ensure builddir can be deleted
 
 %build
@@ -135,6 +138,9 @@ done
 %{_docdir}/emacs-%{pkg}-doc
 
 %changelog
+* Sun Mar 22 2020 José Matos <jamatos@fedoraproject.org> - 18.10.2-2
+- also install el files in the package directory
+
 * Sat Mar 21 2020 José Matos <jamatos@fedoraproject.org> - 18.10.2-1
 - update to 18.10.2
 
diff --git a/ess-18.10.2-install_el_files.patch b/ess-18.10.2-install_el_files.patch
new file mode 100644
index 0000000..e03ae4e
--- /dev/null
+++ b/ess-18.10.2-install_el_files.patch
@@ -0,0 +1,11 @@
+diff -ur ess-18.10.2.orig/lisp/Makefile ess-18.10.2/lisp/Makefile
+--- ess-18.10.2.orig/lisp/Makefile	2018-11-10 09:41:11.000000000 +0000
++++ ess-18.10.2/lisp/Makefile	2020-03-22 19:21:18.207954206 +0000
+@@ -39,6 +39,7 @@
+ 
+ install: dist
+ 	-$(INSTALLDIR) $(LISPDIR)
++	$(INSTALL) $(ELS) $(LISPDIR)
+ 	$(INSTALL) $(ELC) $(LISPDIR)
+ 	if [ -f /etc/debian_version -a -n "$(SITELISP)" -a ! -f "$(SITELISP)/ess-site.el" ] ; \
+ 	then \