- uupdaed files, fix shebang

diff --git a/cmake-helpers.patch b/cmake-helpers.patch
deleted file mode 100644 (file)
index 904863f..0000000
--- a/cmake-helpers.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -urNp -x '*.orig' cmake-3.17.2.org/Auxiliary/CMakeLists.txt cmake-3.17.2/Auxiliary/CMakeLists.txt
---- cmake-3.17.2.org/Auxiliary/CMakeLists.txt  2020-04-28 16:23:06.000000000 +0200
-+++ cmake-3.17.2/Auxiliary/CMakeLists.txt      2021-04-12 22:18:36.892988114 +0200
-@@ -1,4 +1,4 @@
- install(DIRECTORY vim/indent vim/syntax DESTINATION ${CMAKE_DATA_DIR}/editors/vim)
--install(FILES cmake-mode.el DESTINATION ${CMAKE_DATA_DIR}/editors/emacs)
-+install(FILES cmake-mode.el DESTINATION ${CMAKE_INSTALL_DATADIR}/emacs/site-lisp)
- install(FILES cmake.m4 DESTINATION ${CMAKE_XDGDATA_DIR}/aclocal)
- add_subdirectory (bash-completion)
-diff -urNp -x '*.orig' cmake-3.17.2.org/Auxiliary/bash-completion/CMakeLists.txt cmake-3.17.2/Auxiliary/bash-completion/CMakeLists.txt
---- cmake-3.17.2.org/Auxiliary/bash-completion/CMakeLists.txt  2020-04-28 16:23:06.000000000 +0200
-+++ cmake-3.17.2/Auxiliary/bash-completion/CMakeLists.txt      2021-04-12 22:18:36.892988114 +0200
-@@ -5,4 +5,4 @@
- # add symlinks to the files in appropriate places
- #  /etc/bash_completion.d/
- #  DATADIR/completions (may be /usr/share/<package>/completions
--install(FILES cmake cpack ctest DESTINATION ${CMAKE_DATA_DIR}/completions)
-+install(FILES cmake cpack ctest DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions)

diff --git a/cmake.spec b/cmake.spec
index 820adf18bf599bc92a880022c4ceddd74b2b3261..ac2eb0cbcb2e6d92328aa264b538219461fe553e 100644 (file)
--- a/cmake.spec
+++ b/cmake.spec
@@ -25,7 +25,6 @@ Source0:      https://cmake.org/files/v3.22/%{name}-%{version}.tar.gz
 # Source0-md5: f96b91224aa14b09565325b51d60af43
 Patch0:                %{name}-lib64.patch
 Patch1:                %{name}-libx32.patch
-Patch2:                %{name}-helpers.patch
 Patch3:                %{name}-findruby.patch
 Patch4:                %{name}-findruby2.patch
 URL:           https://cmake.org/
@@ -127,10 +126,12 @@ Bashowe dopełnianie parametrów dla cmake'a.
 %if "%{_lib}" == "libx32"
 %patch1 -p1
 %endif
-#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
+%{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
+      Modules/Compiler/XL-Fortran/cpp
+
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
 SET (CMAKE_INSTALL_SYSCONFDIR "%{_sysconfdir}" CACHE PATH " " FORCE)
@@ -198,6 +199,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man7/cmake-modules.7*
 %{_mandir}/man7/cmake-packages.7*
 %{_mandir}/man7/cmake-policies.7*
+%{_mandir}/man7/cmake-presets.7*
 %{_mandir}/man7/cmake-properties.7*
 %{_mandir}/man7/cmake-qt.7*
 %{_mandir}/man7/cmake-server.7*
@@ -209,7 +211,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/cmake/Modules/.NoDartCoverage
 %{_datadir}/cmake/Modules/*
 %{_datadir}/cmake/Templates
-%{_datadir}/cmake/editors
+#%{_datadir}/cmake/editors
 %{_datadir}/cmake/include
 %{_aclocaldir}/cmake.m4