From 906336994699647fba3445399ad06677ba0f143214a55a2cb63d8718c0ae5a8c Mon Sep 17 00:00:00 2001 From: Simon Lees Date: Mon, 25 Feb 2019 23:32:48 +0000 Subject: [PATCH] Accepting request 678963 from home:dancermak:branches:devel:tools:building Add cmake-mode.el without BuildRequires: emacs This should not create a build loop as the first sr. Also, cmake now builds on Leap 42 and SLE 12 OBS-URL: https://build.opensuse.org/request/show/678963 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=353 --- cmake.changes | 6 ++++++ cmake.spec | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/cmake.changes b/cmake.changes index cce50c1..27f1be9 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 25 13:53:26 UTC 2019 - Dan Čermák + +- Install cmake-mode.el + * remove a left over .orig file on Leap <= 42.3 and SLE 12 <= SP3 + ------------------------------------------------------------------- Wed Feb 20 15:52:37 UTC 2019 - schwab@suse.de diff --git a/cmake.spec b/cmake.spec index 21fd753..21a532d 100644 --- a/cmake.spec +++ b/cmake.spec @@ -116,6 +116,17 @@ do ln -s ../../%{name}/completions/$(basename $f) %{buildroot}%{_datadir}/bash-completion/completions done +# cmake-mode.el +%define cmake_mode_el %{_datadir}/emacs/site-lisp/%{name}-mode.el +install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{cmake_mode_el} +rm %{buildroot}%{_datadir}/%{name}/editors/emacs/cmake-mode.el + +# SLE12 or OpenSUSE Leap 42 +%if 0%{?suse_version} == 1315 +# remove left over orig file +rm %{buildroot}%{_datadir}/%{name}/Modules/FindPythonInterp.cmake.orig +%endif + %fdupes %{buildroot}%{_datadir}/cmake %check @@ -142,5 +153,7 @@ done %{_datadir}/aclocal/cmake.m4 %doc %{_docdir}/%{name} %{_datadir}/bash-completion +%{cmake_mode_el} +%dir %{dirname:%{cmake_mode_el}} %changelog