From aea0b30561d45ca9afdf369b88945f787371616b Mon Sep 17 00:00:00 2001
From: Roy Rankin <rrankin@ihug.com.au>
Date: Jul 07 2016 11:41:10 +0000
Subject: obsolete emacs-sdcc


---

diff --git a/sdcc.spec b/sdcc.spec
index 786162b..2ee843d 100644
--- a/sdcc.spec
+++ b/sdcc.spec
@@ -1,6 +1,6 @@
 Name:           sdcc
 Version:        3.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Small Device C Compiler
 Group:          Applications/Engineering
 License:        GPLv2+
@@ -18,7 +18,9 @@ BuildRequires:  tex(ulem.sty)
 BuildRequires:  texinfo
 # Work around to lyx-common missing R: /usr/bin/python
 BuildRequires:  /usr/bin/python
-Provides: bundled(libiberty)
+Provides:       bundled(libiberty)
+Requires:       emacs-filesystem
+Obsoletes:      emacs-sdcc < 3.6.0
 
 
 %description
@@ -39,18 +41,6 @@ SDCC is a C compiler for 8051 class and similar microcontrollers.
 This package includes the sources for the C library, and is only necessary
 if you want to modify the C library or as reference of how it works.
 
-
-%package -n emacs-sdcc
-Summary:        Emacs extensions for SDCC
-Group:          Applications/Editors
-License:        GPLv2+
-Requires:       sdcc = %{version}-%{release}
-Requires:       emacs(bin)
-
-%description -n emacs-sdcc
-Emacs extensions for SDCC.
-
-
 %prep
 %setup -q
 find -name '*.{c,h,cc}' -exec chmod -x '{}' \;
@@ -72,8 +62,8 @@ OPTS='PDFOPT="/bin/cp"'
 make install DESTDIR=$RPM_BUILD_ROOT Q=
 mv $RPM_BUILD_ROOT%{_datadir}/doc installed-docs
 install -m 644 %SOURCE1 installed-docs
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/%{name}
+mv $RPM_BUILD_ROOT%{_bindir}/*.el $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/%{name}
 find $RPM_BUILD_ROOT -type f -name \*.c -exec chmod a-x '{}' \;
 mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/sdcc
 mv $RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_libexecdir}/sdcc
@@ -99,6 +89,7 @@ popd
 %{_bindir}/*
 %{_libexecdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/emacs/site-lisp/%{name}/*.el
 %exclude %{_datadir}/%{name}/lib/src
 # Don't include support files as already in binutils-devel
 %exclude %{_includedir}/
@@ -111,11 +102,10 @@ popd
 %{_datadir}/%{name}/lib/src
 
 
-%files -n emacs-sdcc
-%{_datadir}/emacs/site-lisp/*.el
-
-
 %changelog
+* Thu Jul 07 2016 Roy Rankin <rrankin@ihug.com.au> - 3.6.0-2
+- Incorporate emacs files into main package and obsolete emacs-sdcc package
+
 * Sun Jun 26 2016 Roy Rankin <rrankin@ihug.com.au> - 3.6.0-1
 - Upstream update, add texinfo build depend