From c3c18cfcea55451daf1da352118fddebde40ed62 Mon Sep 17 00:00:00 2001 From: Sergey Zhemoitel Date: Sat, 25 Apr 2020 16:22:06 +0300 Subject: [PATCH] Update to 3.17.1 --- .abf.yml | 2 +- cmake.rpmlintrc | 5 +++++ cmake.spec | 14 ++++++++------ 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 cmake.rpmlintrc diff --git a/.abf.yml b/.abf.yml index 690798d..f761856 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - cmake-3.7.2.tar.gz: ea73af0c3c832e586bf2f82a13a708ea509d5a88 + cmake-3.17.1.tar.gz: c5f11d66a9c37011264400b4e36e6dd0b4ae9160 diff --git a/cmake.rpmlintrc b/cmake.rpmlintrc new file mode 100644 index 0000000..9e44799 --- /dev/null +++ b/cmake.rpmlintrc @@ -0,0 +1,5 @@ +addFilter("W: devel-file-in-non-devel-package") +addFilter("E: wrong-script-interpreter") +addFilter("W: non-executable-script") +addFilter("W: non-conffile-in-etc") +addFilter("E: zero-length") diff --git a/cmake.spec b/cmake.spec index fb50b25..49c48ad 100644 --- a/cmake.spec +++ b/cmake.spec @@ -4,13 +4,14 @@ Summary: Cross-platform, open-source make system Name: cmake -Version: 3.7.2 -Release: 3 +Version: 3.17.1 +Release: 1 Epoch: 1 License: BSD Group: Development/Other Url: http://www.cmake.org/HTML/index.html Source0: http://www.cmake.org/files/v%{shortVersion}/%{name}-%{version}.tar.gz +Source1000: %{name}.rpmlintrc Source1: cmake.macros Patch0: cmake-3.7.2-optflags.patch Patch1: cmake-3.6.1-fltk133.patch @@ -22,12 +23,13 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libarchive) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libidn) -BuildRequires: pkgconfig(libuv) +BuildRequires: pkgconfig(libuv) >= 1.0.0 BuildRequires: pkgconfig(ncurses) %if !%{with bootstrap} -BuildRequires: pkgconfig(QtCore) +BuildRequires: pkgconfig(Qt5Core) %endif BuildRequires: pkgconfig(zlib) +BuildRequires: %{_lib}rhash-devel %description CMake is used to control the software compilation process using @@ -67,7 +69,7 @@ This is the Qt GUI. %files -n %{name}-qtgui %{_bindir}/cmake-gui -%{_datadir}/applications/CMake.desktop +%{_datadir}/applications/cmake-gui.desktop %{_datadir}/mime/packages/cmakecache.xml %{_iconsdir}/hicolor/*/apps/CMakeSetup.* %endif @@ -76,7 +78,7 @@ This is the Qt GUI. %prep %setup -q -%apply_patches +#apply_patches # Don't try to automagically find files in /usr/X11R6 # But also don't change a prefix if it is not /usr