From be01f61e6368a13e920ad39b33200bd6508ad9a1 Mon Sep 17 00:00:00 2001 From: Alex Cobb Date: Jan 08 2019 06:53:14 +0000 Subject: [PATCH 1/3] Add emacs-cython-mode subpackage --- diff --git a/Cython.spec b/Cython.spec index d2df192..d4b7c5a 100644 --- a/Cython.spec +++ b/Cython.spec @@ -7,7 +7,7 @@ Name: Cython %global upver 0.29.1 Version: 0.29.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Language for writing Python extension modules License: ASL 2.0 @@ -59,12 +59,26 @@ BuildRequires: python3-jedi Python 3 version. +%package -n emacs-cython-mode +Summary: A major mode for editing Cython source files in Emacs +BuildArch: noarch +BuildRequires: emacs +Requires: emacs(bin) >= %{_emacs_version} + +%description -n emacs-cython-mode +cython-mode is an Emacs major mode for editing Cython source files. + %prep %autosetup -n %{upname}-%{upver} -p1 %build %py2_build %py3_build +# emacs-cython-mode build +echo ";; +(require 'cython-mode)" > cython-mode-init.el +cp -p Tools/cython-mode.el . +%{_emacs_bytecompile} *.el %install %py2_install @@ -75,6 +89,13 @@ rm %{buildroot}%{_bindir}/* rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests +# emacs-cython-mode install +rm -rf %{uildroot}%{_emacs_sitelispdir} +mkdir -p %{buildroot}%{_emacs_sitelispdir}/ +cp -p cython-mode.el cython-mode.elc %{buildroot}%{_emacs_sitelispdir}/ +mkdir -p %{buildroot}%{_emacs_sitestartdir}/ +cp -p cython-mode-init.el cython-mode-init.elc %{buildroot}%{_emacs_sitestartdir}/ + %if %{with tests} %check %{__python2} runtests.py -vv @@ -101,7 +122,14 @@ rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests %{python3_sitearch}/%{upname}.py %{python3_sitearch}/__pycache__/%{upname}.* +%files -n emacs-cython-mode +%license LICENSE.txt +%{_emacs_sitelispdir}/* + %changelog +* Tue Jan 08 2019 Alex Cobb - 0.29.1-2 +- Added emacs-cython-mode subpackage. + * Mon Dec 10 2018 Igor Gnatenko - 0.29.1-1 - Update to 0.29.1 @@ -382,4 +410,3 @@ rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests * Tue Feb 26 2008 Neal Becker - 0.9.6.12-1 - Initial version - From 8f120aeed02907c303a54f2a5e92a5f0350bda5f Mon Sep 17 00:00:00 2001 From: Alex Cobb Date: Jan 08 2019 10:07:17 +0000 Subject: [PATCH 2/3] Bug fixes --- diff --git a/Cython.spec b/Cython.spec index d4b7c5a..d616448 100644 --- a/Cython.spec +++ b/Cython.spec @@ -90,7 +90,6 @@ rm -rf %{buildroot}%{python3_sitelib}/setuptools/tests # emacs-cython-mode install -rm -rf %{uildroot}%{_emacs_sitelispdir} mkdir -p %{buildroot}%{_emacs_sitelispdir}/ cp -p cython-mode.el cython-mode.elc %{buildroot}%{_emacs_sitelispdir}/ mkdir -p %{buildroot}%{_emacs_sitestartdir}/ @@ -125,6 +124,7 @@ cp -p cython-mode-init.el cython-mode-init.elc %{buildroot}%{_emacs_sitestartdir %files -n emacs-cython-mode %license LICENSE.txt %{_emacs_sitelispdir}/* +%{_emacs_sitestartdir}/* %changelog * Tue Jan 08 2019 Alex Cobb - 0.29.1-2 From 5bb10df3ab2210d53686ac53b03b54a6f08d39b9 Mon Sep 17 00:00:00 2001 From: Alex Cobb Date: Jan 08 2019 10:46:02 +0000 Subject: [PATCH 3/3] Fix files for emacs-cython-mode Subpackage should not own _emacs_sitestartdir. --- diff --git a/Cython.spec b/Cython.spec index d616448..c660469 100644 --- a/Cython.spec +++ b/Cython.spec @@ -123,8 +123,8 @@ cp -p cython-mode-init.el cython-mode-init.elc %{buildroot}%{_emacs_sitestartdir %files -n emacs-cython-mode %license LICENSE.txt -%{_emacs_sitelispdir}/* -%{_emacs_sitestartdir}/* +%{_emacs_sitelispdir}/cython*.el* +%{_emacs_sitestartdir}/cython*.el* %changelog * Tue Jan 08 2019 Alex Cobb - 0.29.1-2