diff --git a/cmake.changes b/cmake.changes index 106516d..6879d0d 100644 --- a/cmake.changes +++ b/cmake.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Nov 13 13:48:07 UTC 2019 - Martin Pluskal + +- Switch back to libcurl-mini-devel to avoid new build cycle + ------------------------------------------------------------------- Sun Nov 10 09:07:55 UTC 2019 - Andreas Stieger diff --git a/cmake.spec b/cmake.spec index 25b9929..7530559 100644 --- a/cmake.spec +++ b/cmake.spec @@ -1,7 +1,7 @@ # # spec file for package cmake # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,13 +28,6 @@ Name: cmake%{psuffix} Version: 3.15.5 Release: 0 -%if %{with gui} -Summary: CMake graphical user interface -License: BSD-3-Clause -%else -Summary: Cross-platform make system -License: BSD-3-Clause -%endif URL: https://www.cmake.org/ Source0: https://www.cmake.org/files/v%{shortversion}/cmake-%{version}.tar.gz Source1: cmake.macros @@ -51,6 +44,7 @@ Patch2: form.patch Patch3: feature-suse-python-interp-search-order.patch BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libcurl-mini-devel # this is commented as it would create dependancy cycle between jsoncpp and cmake #if 0 % { ? suse_version} > 1320 #BuildRequires: pkgconfig(jsoncpp) @@ -60,13 +54,19 @@ BuildRequires: rhash-devel BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libarchive) >= 3.0.2 -BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libuv) >= 1.10 BuildRequires: pkgconfig(ncurses) BuildRequires: pkgconfig(zlib) Requires: make %if %{with gui} +Summary: CMake graphical user interface +License: BSD-3-Clause +%else +Summary: Cross-platform make system +License: BSD-3-Clause +%endif +%if %{with gui} BuildRequires: python-sphinx BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Widgets)