- Drop emacs support as it leads to creation of build cycle

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/cmake?expand=0&rev=349

cmake-gui.spec

@@ -17,6 +17,13 @@
 
 
 %define shortversion 3.13
+# exclude for SLE 12 and Leap 42.x
+%if 0%{?suse_version} == 1315
+%define system_libuv OFF
+%else
+%define system_libuv ON
+BuildRequires:  libuv-devel >= 1.10
+%endif
 Name:           cmake-gui
 Version:        3.13.4
 Release:        0
@@ -37,13 +44,6 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libexpat-devel
-# exclude for SLE 12 and Leap 42.x
-%if 0%{?suse_version} == 1315
-%define system_libuv OFF
-%else
-BuildRequires:  libuv-devel >= 1.10
-%define system_libuv ON
-%endif
 BuildRequires:  openssl-devel
 # this is commented as it would create dependancy cycle between jsoncpp and cmake
 #if 0%{?suse_version} > 1320

cmake.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb 15 09:22:35 UTC 2019 - Martin Pluskal <mpluskal@suse.com>
+
+- Drop emacs support as it leads to creation of build cycle
+
 -------------------------------------------------------------------
 Tue Feb 12 13:05:51 UTC 2019 - Dan Čermák <dcermak@suse.com>
 

cmake.spec

@@ -17,6 +17,13 @@
 
 
 %define shortversion 3.13
+# exclude for SLE 12 and Leap 42.x
+%if 0%{?suse_version} == 1315
+%define system_libuv OFF
+%else
+%define system_libuv ON
+BuildRequires:  libuv-devel >= 1.10
+%endif
 Name:           cmake
 Version:        3.13.4
 Release:        0
@@ -40,24 +47,11 @@ Patch5:         system-libs.patch
 # Search for python interpreters from newest to oldest rather then picking up /usr/bin/python as first choice
 Patch7:         feature-suse-python-interp-search-order.patch
 Patch8:         c17-default.patch
-BuildRequires:  emacs-nox
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libarchive-devel >= 3.0.2
 BuildRequires:  libbz2-devel
-%if 0%{?suse_version} >= 1330
-BuildRequires:  libcurl-mini-devel
-%else
-BuildRequires:  libcurl-devel
-%endif
 BuildRequires:  libexpat-devel
-# exclude for SLE 12 and Leap 42.x
-%if 0%{?suse_version} == 1315
-%define system_libuv OFF
-%else
-BuildRequires:  libuv-devel >= 1.10
-%define system_libuv ON
-%endif
 BuildRequires:  ncurses-devel
 # this is commented as it would create dependancy cycle between jsoncpp and cmake
 #if 0%{?suse_version} > 1320
@@ -71,6 +65,11 @@ Requires:       make
 # bnc#953842 - A python file is shipped so require python base so it can be run.
 Requires:       python3-base
 Recommends:     cmake-man
+%if 0%{?suse_version} >= 1330
+BuildRequires:  libcurl-mini-devel
+%else
+BuildRequires:  libcurl-devel
+%endif
 
 %description
 CMake is a cross-platform, open-source build system
@@ -118,13 +117,6 @@ 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}
-/usr/bin/emacs-nox -batch --no-init-file --no-site-file \
-    --eval '(progn (setq load-path (cons "." load-path)))' -f batch-byte-compile \
-    %{buildroot}%{cmake_mode_el}
-
 %fdupes %{buildroot}%{_datadir}/cmake
 
 %check
@@ -151,6 +143,5 @@ install -D -p -m 0644 Auxiliary/cmake-mode.el %{buildroot}%{cmake_mode_el}
 %{_datadir}/aclocal/cmake.m4
 %doc %{_docdir}/%{name}
 %{_datadir}/bash-completion
-%{cmake_mode_el}*
 
 %changelog