From 53abd1608510ce98cf479a1e801d7c14907285c9 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Mon, 28 Aug 2023 20:14:02 +0200 Subject: [PATCH 1/5] Improve spec template * %autorelease must not have {}, otherwise "Dist tag is present." error is triggered in fedora-review, see: https://pagure.io/FedoraReview/blob/d037481/f/plugins/generic.py#_425 * Also remove {} from %autochangelog while at it. --- neovim.spec | 5 ++++- spec-template | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/neovim.spec b/neovim.spec index 417d2d0..90189e0 100644 --- a/neovim.spec +++ b/neovim.spec @@ -35,7 +35,7 @@ Name: neovim Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} License: Apache-2.0 AND Vim Summary: Vim-fork focused on extensibility and agility @@ -1945,6 +1945,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Mon Aug 28 2023 LuK1337 - 0.9.1-4 +- Improve spec template + * Thu Jul 20 2023 Fedora Release Engineering - 0.9.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/spec-template b/spec-template index 30e6437..cc35793 100644 --- a/spec-template +++ b/spec-template @@ -1,6 +1,6 @@ Name: Version: -Release: %{autorelease} +Release: %autorelease Summary: License: @@ -35,4 +35,4 @@ Requires: %changelog -%{autochangelog} +%autochangelog From 0e4ab3891ee7183939d4564ec07c23786a04aa69 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 7 Sep 2023 16:08:13 +0200 Subject: [PATCH 2/5] Update to version 0.9.2 --- .gitignore | 1 + neovim.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 71033ba..94c3c15 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /neovim-0.8.3.tar.gz /neovim-0.9.0.tar.gz /neovim-0.9.1.tar.gz +/neovim-0.9.2.tar.gz diff --git a/neovim.spec b/neovim.spec index 90189e0..00e6753 100644 --- a/neovim.spec +++ b/neovim.spec @@ -34,8 +34,8 @@ %endif Name: neovim -Version: 0.9.1 -Release: 4%{?dist} +Version: 0.9.2 +Release: 1%{?dist} License: Apache-2.0 AND Vim Summary: Vim-fork focused on extensibility and agility @@ -1945,6 +1945,10 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Thu Sep 07 2023 Andreas Schneider - 0.9.2-1 +- Update to version 0.9.2 + * For changelog see `:help news` + * Mon Aug 28 2023 LuK1337 - 0.9.1-4 - Improve spec template diff --git a/sources b/sources index 88c3b1a..14be258 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (neovim-0.9.1.tar.gz) = 339efd3d8c1a73aa3b43e8770d6943aeba9e4ce6a3598c0424e388f80759d50b14aa7c60fd435bf2d17997476e06d28b79e7e98670d02ca9ceec031841e8b9b8 +SHA512 (neovim-0.9.2.tar.gz) = f12ae48c82c4a3622e464a23966cb06e9da1a7cd000b4efeb8408bb55e189ffeb4ece99e9488244c16f7de70356303e4dc964afd70ab24d23a5e07c59e902ed9 From 6428b764c1f60b0769f46cde4f4c73e5baf0fca1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 20 Oct 2023 15:49:13 +0200 Subject: [PATCH 3/5] Update to version 0.9.4 --- .gitignore | 1 + neovim-fix-cmake-find-libluv.patch | 15 +++++++++++++++ neovim.spec | 16 +++++++++++++--- sources | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 neovim-fix-cmake-find-libluv.patch diff --git a/.gitignore b/.gitignore index 94c3c15..ec5f1b4 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /neovim-0.9.0.tar.gz /neovim-0.9.1.tar.gz /neovim-0.9.2.tar.gz +/neovim-0.9.4.tar.gz diff --git a/neovim-fix-cmake-find-libluv.patch b/neovim-fix-cmake-find-libluv.patch new file mode 100644 index 0000000..36cfd1d --- /dev/null +++ b/neovim-fix-cmake-find-libluv.patch @@ -0,0 +1,15 @@ +Index: neovim-0.9.4/src/nvim/CMakeLists.txt +=================================================================== +--- neovim-0.9.4.orig/src/nvim/CMakeLists.txt 2023-10-09 22:38:17.000000000 +0200 ++++ neovim-0.9.4/src/nvim/CMakeLists.txt 2023-10-20 22:49:27.287874311 +0200 +@@ -3,8 +3,8 @@ add_executable(nvim main.c) + + add_library(libuv INTERFACE) + find_package(libuv CONFIG) +-if(TARGET libuv::uv_a) +- target_link_libraries(libuv INTERFACE libuv::uv_a) ++if(TARGET libuv::uv) ++ target_link_libraries(libuv INTERFACE libuv::uv) + mark_as_advanced(libuv_DIR) + else() + # Fall back to find module for older libuv versions that don't provide config file diff --git a/neovim.spec b/neovim.spec index 00e6753..db17e13 100644 --- a/neovim.spec +++ b/neovim.spec @@ -34,7 +34,7 @@ %endif Name: neovim -Version: 0.9.2 +Version: 0.9.4 Release: 1%{?dist} License: Apache-2.0 AND Vim @@ -45,6 +45,8 @@ Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v Source1: sysinit.vim Source2: spec-template +Patch0: neovim-fix-cmake-find-libluv.patch + Patch1000: neovim-lua-bit32.patch BuildRequires: gcc-c++ @@ -69,7 +71,7 @@ Requires: lua5.1-luv >= %{luv_min_ver} # /with luajit %endif BuildRequires: lua5.1-lpeg -BuildRequires: lua5.1-mpack +BuildRequires: lua5.1-mpack >= 1.0.11 %if %{with jemalloc} BuildRequires: jemalloc-devel %endif @@ -105,6 +107,7 @@ parts of Vim, without compromise, and more. %prep %setup -q +%patch -P 0 -p1 %if %{without luajit} %patch -P 1000 -p1 %endif @@ -562,6 +565,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/ftplugin/css.vim %{_datadir}/nvim/runtime/ftplugin/cucumber.vim %{_datadir}/nvim/runtime/ftplugin/cvsrc.vim +%{_datadir}/nvim/runtime/ftplugin/d.lua %{_datadir}/nvim/runtime/ftplugin/debchangelog.vim %{_datadir}/nvim/runtime/ftplugin/debcontrol.vim %{_datadir}/nvim/runtime/ftplugin/denyhosts.vim @@ -1087,7 +1091,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/lua/vim/_editor.lua %{_datadir}/nvim/runtime/lua/vim/_init_packages.lua %{_datadir}/nvim/runtime/lua/vim/_inspector.lua -%{_datadir}/nvim/runtime/lua/vim/_meta.lua +%{_datadir}/nvim/runtime/lua/vim/_options.lua %{_datadir}/nvim/runtime/lua/vim/_watch.lua %{_datadir}/nvim/runtime/lua/vim/diagnostic.lua %{_datadir}/nvim/runtime/lua/vim/filetype.lua @@ -1945,6 +1949,12 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Fri Oct 20 2023 Andreas Schneider - 0.9.4-1 +- Update to version 0.9.4 + * https://github.com/neovim/neovim/releases/tag/v0.9.4 + * For bigger version bump changelog see `:help news` + * resolves: rhbz#2243010 + * Thu Sep 07 2023 Andreas Schneider - 0.9.2-1 - Update to version 0.9.2 * For changelog see `:help news` diff --git a/sources b/sources index 14be258..f9fad0d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (neovim-0.9.2.tar.gz) = f12ae48c82c4a3622e464a23966cb06e9da1a7cd000b4efeb8408bb55e189ffeb4ece99e9488244c16f7de70356303e4dc964afd70ab24d23a5e07c59e902ed9 +SHA512 (neovim-0.9.4.tar.gz) = a9bac18aeecd99dfeab79b367c3f0c46003b95d057edb6fd18ba178d6b6f22434689508d0bfe91b2f771ef0a23a4888815e8c4001abb76f2a60357bab0cd7004 From 0bd6000b1a935f47cbdef8aacfd3c650807c386d Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Tue, 2 Jan 2024 09:05:04 +0100 Subject: [PATCH 4/5] Update to version 0.9.5 resolves: rhbz#2256278 --- .gitignore | 6 ++++++ neovim.spec | 8 +++++++- sources | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ec5f1b4..88a99c7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,8 @@ +/*.log +/*.rpm +/series +/x86_64/ +/results_neovim/ /neovim-0.1.7.tar.gz /neovim-0.2.0.tar.gz /neovim-0.2.1.tar.gz @@ -28,3 +33,4 @@ /neovim-0.9.1.tar.gz /neovim-0.9.2.tar.gz /neovim-0.9.4.tar.gz +/neovim-0.9.5.tar.gz diff --git a/neovim.spec b/neovim.spec index db17e13..106071e 100644 --- a/neovim.spec +++ b/neovim.spec @@ -34,7 +34,7 @@ %endif Name: neovim -Version: 0.9.4 +Version: 0.9.5 Release: 1%{?dist} License: Apache-2.0 AND Vim @@ -1949,6 +1949,12 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Tue Jan 02 2024 Andreas Schneider - 0.9.5-1 +- Update to version 0.9.5 + * https://github.com/neovim/neovim/releases/tag/v0.9.5 + * For bigger version bump changelog see `:help news` + * resolves: rhbz#2256278 + * Fri Oct 20 2023 Andreas Schneider - 0.9.4-1 - Update to version 0.9.4 * https://github.com/neovim/neovim/releases/tag/v0.9.4 diff --git a/sources b/sources index f9fad0d..2846255 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (neovim-0.9.4.tar.gz) = a9bac18aeecd99dfeab79b367c3f0c46003b95d057edb6fd18ba178d6b6f22434689508d0bfe91b2f771ef0a23a4888815e8c4001abb76f2a60357bab0cd7004 +SHA512 (neovim-0.9.5.tar.gz) = 6e20d0a1d506dc292dd68dabe4b5635f86c019ca832f9927e907377e6d21fe7765b3010f5bba644bb2d7a76c178d55b290af24856a7e3c4083a1aa60bc496775 From c449241bd9b91d5ecb9c14a91337da20fe9daff1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 4 Mar 2024 14:49:17 +0100 Subject: [PATCH 5/5] Build with luajit on s390x resolves: #2222911 --- neovim.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neovim.spec b/neovim.spec index 106071e..814b7bd 100644 --- a/neovim.spec +++ b/neovim.spec @@ -5,7 +5,7 @@ %endif %bcond_with jemalloc -%ifarch %{arm} %{ix86} x86_64 %{mips} +%ifarch %{arm} %{ix86} x86_64 %{mips} s390x %bcond_without luajit %else %ifarch aarch64 @@ -35,7 +35,7 @@ Name: neovim Version: 0.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: Apache-2.0 AND Vim Summary: Vim-fork focused on extensibility and agility @@ -1949,6 +1949,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \ %{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json %changelog +* Mon Mar 04 2024 Andreas Schneider - 0.9.5-2 +- resolves: #2222911 - Build with luajit on s390x + * Tue Jan 02 2024 Andreas Schneider - 0.9.5-1 - Update to version 0.9.5 * https://github.com/neovim/neovim/releases/tag/v0.9.5