asn pushed to neovim (rawhide). "Update to version 0.8.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:52:33 UTC
From 42decb69fad1e5bef9f0561a347729a02e504a19 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn(a)cryptomilk.org>
Date: Sep 30 2022 21:51:20 +0000
Subject: Update to version 0.8.0
---
diff --git a/.gitignore b/.gitignore
index e575aec..7e2620b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/neovim-0.6.1.tar.gz
/neovim-0.7.0.tar.gz
/neovim-0.7.2.tar.gz
+/neovim-0.8.0.tar.gz
diff --git a/neovim-libvterm-0-3-support.patch b/neovim-libvterm-0-3-support.patch
deleted file mode 100644
index 1c7b74c..0000000
--- a/neovim-libvterm-0-3-support.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From 74db632c978cc391c70d13673b468f80c452d932 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn(a)cryptomilk.org>
-Date: Tue, 8 Feb 2022 18:58:36 +0100
-Subject: refactor(term): Support libvterm 0.3
-
----
- src/nvim/terminal.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-Index: neovim-0.7.2/src/nvim/terminal.c
-===================================================================
---- neovim-0.7.2.orig/src/nvim/terminal.c 2022-06-26 17:08:22.000000000 +0200
-+++ neovim-0.7.2/src/nvim/terminal.c 2022-09-21 13:22:20.456525182 +0200
-@@ -118,6 +118,10 @@ struct terminal {
- // window height has increased) and must be deleted from the terminal buffer
- int sb_pending;
-
-+ char *title; // VTermStringFragment buffer
-+ size_t title_len; // number of rows pushed to sb_buffer
-+ size_t title_size; // sb_buffer size
-+
- // buf_T instance that acts as a "drawing surface" for libvterm
- // we can't store a direct reference to the buffer because the
- // refresh_timer_cb may be called after the buffer was freed, and there's
-@@ -228,7 +232,7 @@ Terminal *terminal_open(buf_T *buf, Term
- set_option_value("wrap", false, NULL, OPT_LOCAL);
- set_option_value("list", false, NULL, OPT_LOCAL);
- if (buf->b_ffname != NULL) {
-- buf_set_term_title(buf, (char *)buf->b_ffname);
-+ buf_set_term_title(buf, buf->b_ffname, strlen((char *)buf->b_ffname));
- }
- RESET_BINDING(curwin);
- // Reset cursor in current window.
-@@ -605,6 +609,7 @@ void terminal_destroy(Terminal *term)
- xfree(term->sb_buffer[i]);
- }
- xfree(term->sb_buffer);
-+ xfree(term->title);
- vterm_free(term->vt);
- xfree(term);
- }
-@@ -827,13 +832,13 @@ static int term_movecursor(VTermPos new,
- return 1;
- }
-
--static void buf_set_term_title(buf_T *buf, char *title)
-+static void buf_set_term_title(buf_T *buf, const char *title, size_t len)
- FUNC_ATTR_NONNULL_ALL
- {
- Error err = ERROR_INIT;
- dict_set_var(buf->b_vars,
- STATIC_CSTR_AS_STRING("term_title"),
-- STRING_OBJ(cstr_as_string(title)),
-+ STRING_OBJ(((String){ .data = (char *)title, .size = len })),
- false,
- false,
- &err);
-@@ -856,7 +861,34 @@ static int term_settermprop(VTermProp pr
-
- case VTERM_PROP_TITLE: {
- buf_T *buf = handle_get_buffer(term->buf_handle);
-- buf_set_term_title(buf, val->string);
-+#if VTERM_VERSION_MAJOR > 0 || (VTERM_VERSION_MAJOR == 0 && VTERM_VERSION_MINOR >= 2)
-+ VTermStringFragment frag = val->string;
-+
-+ if (frag.initial && frag.final) {
-+ buf_set_term_title(buf, frag.str, frag.len);
-+ break;
-+ }
-+
-+ if (frag.initial) {
-+ term->title_len = 0;
-+ term->title_size = MAX(frag.len, 1024);
-+ term->title = xmalloc(sizeof(char *) * term->title_size);
-+ } else if (term->title_len + frag.len > term->title_size) {
-+ term->title_size *= 2;
-+ term->title = xrealloc(term->title, sizeof(char *) * term->title_size);
-+ }
-+
-+ memcpy(term->title + term->title_len, frag.str, frag.len);
-+ term->title_len += frag.len;
-+
-+ if (frag.final) {
-+ buf_set_term_title(buf, term->title, term->title_len);
-+ xfree(term->title);
-+ term->title = NULL;
-+ }
-+#else
-+ buf_set_term_title(buf, val->string, strlen(val->string));
-+#endif
- break;
- }
-
-Index: neovim-0.7.2/test/functional/terminal/altscreen_spec.lua
-===================================================================
---- neovim-0.7.2.orig/test/functional/terminal/altscreen_spec.lua 2022-06-26 17:08:22.000000000 +0200
-+++ neovim-0.7.2/test/functional/terminal/altscreen_spec.lua 2022-09-21 13:22:20.457525181 +0200
-@@ -126,13 +126,13 @@ describe(':terminal altscreen', function
- wait_removal()
- feed('<c-\\><c-n>4k')
- screen:expect([[
-- ^line3 |
-+ ^ |
- |
- |
- rows: 4, cols: 50 |
- |
- ]])
-- eq(8, curbuf('line_count'))
-+ eq(9, curbuf('line_count'))
- end)
-
- describe('and after exit', function()
-@@ -142,15 +142,11 @@ describe(':terminal altscreen', function
- end)
-
- it('restore buffer state', function()
-- -- FIXME(tarruda): Note that the last line was lost after restoring the
-- -- screen. This is a libvterm bug: When the main screen is restored it
-- -- seems to "cut" lines that would have been left below the new visible
-- -- screen.
- screen:expect([[
-- line4 |
- line5 |
- line6 |
- line7 |
-+ line8 |
- {3:-- TERMINAL --} |
- ]])
- end)
-Index: neovim-0.7.2/CMakeLists.txt
-===================================================================
---- neovim-0.7.2.orig/CMakeLists.txt 2022-06-26 17:08:22.000000000 +0200
-+++ neovim-0.7.2/CMakeLists.txt 2022-09-21 13:22:24.923523896 +0200
-@@ -501,7 +501,7 @@ if(FEAT_TUI)
- include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS})
- endif()
-
--find_package(LIBVTERM 0.1 REQUIRED)
-+find_package(LIBVTERM 0.3 REQUIRED)
- include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS})
-
- if(WIN32)
diff --git a/neovim.spec b/neovim.spec
index 0139159..0ab4f80 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -39,8 +39,8 @@
%endif
Name: neovim
-Version: 0.7.2
-Release: 4%{?dist}
+Version: 0.8.0
+Release: 0%{?dist}
License: ASL 2.0
Summary: Vim-fork focused on extensibility and agility
@@ -50,9 +50,6 @@ Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{v
Source1: sysinit.vim
Source2: spec-template
-# Based on https://github.com/neovim/neovim/pull/20222.patch
-Patch0: neovim-libvterm-0-3-support.patch
-
Patch1000: neovim-lua-bit32.patch
Patch1001: neovim-cmake-lua-5.1.patch
@@ -112,8 +109,6 @@ parts of Vim, without compromise, and more.
%prep
%setup -q
-%patch0 -p1
-
%if %{without luajit}
%patch1000 -p1
%patch1001 -p1
@@ -185,6 +180,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/autoload/RstFold.vim
%{_datadir}/nvim/runtime/autoload/ada.vim
%{_datadir}/nvim/runtime/autoload/adacomplete.vim
+%{_datadir}/nvim/runtime/autoload/bitbake.vim
%{_datadir}/nvim/runtime/autoload/ccomplete.vim
%{_datadir}/nvim/runtime/autoload/clojurecomplete.vim
%{_datadir}/nvim/runtime/autoload/context.vim
@@ -200,7 +196,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/autoload/health/provider.vim
%{_datadir}/nvim/runtime/autoload/htmlcomplete.vim
%{_datadir}/nvim/runtime/autoload/javascriptcomplete.vim
-%{_datadir}/nvim/runtime/autoload/man.vim
%{_datadir}/nvim/runtime/autoload/msgpack.vim
%{_datadir}/nvim/runtime/autoload/netrw.vim
%{_datadir}/nvim/runtime/autoload/netrwFileHandlers.vim
@@ -209,6 +204,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/autoload/paste.vim
%{_datadir}/nvim/runtime/autoload/phpcomplete.vim
%{_datadir}/nvim/runtime/autoload/provider.vim
+%{_datadir}/nvim/runtime/autoload/python.vim
%{_datadir}/nvim/runtime/autoload/python3complete.vim
%{_datadir}/nvim/runtime/autoload/pythoncomplete.vim
%{_datadir}/nvim/runtime/autoload/rubycomplete.vim
@@ -265,12 +261,15 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/colors/desert.vim
%{_datadir}/nvim/runtime/colors/elflord.vim
%{_datadir}/nvim/runtime/colors/evening.vim
+%{_datadir}/nvim/runtime/colors/habamax.vim
%{_datadir}/nvim/runtime/colors/industry.vim
%{_datadir}/nvim/runtime/colors/koehler.vim
+%{_datadir}/nvim/runtime/colors/lunaperche.vim
%{_datadir}/nvim/runtime/colors/morning.vim
%{_datadir}/nvim/runtime/colors/murphy.vim
%{_datadir}/nvim/runtime/colors/pablo.vim
%{_datadir}/nvim/runtime/colors/peachpuff.vim
+%{_datadir}/nvim/runtime/colors/quiet.vim
%{_datadir}/nvim/runtime/colors/ron.vim
%{_datadir}/nvim/runtime/colors/shine.vim
%{_datadir}/nvim/runtime/colors/slate.vim
@@ -316,8 +315,10 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/compiler/gnat.vim
%{_datadir}/nvim/runtime/compiler/go.vim
%{_datadir}/nvim/runtime/compiler/haml.vim
+%{_datadir}/nvim/runtime/compiler/hare.vim
%{_datadir}/nvim/runtime/compiler/hp_acc.vim
%{_datadir}/nvim/runtime/compiler/icc.vim
+%{_datadir}/nvim/runtime/compiler/icon.vim
%{_datadir}/nvim/runtime/compiler/ifort.vim
%{_datadir}/nvim/runtime/compiler/intel.vim
%{_datadir}/nvim/runtime/compiler/irix5_c.vim
@@ -340,10 +341,16 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/compiler/onsgmls.vim
%{_datadir}/nvim/runtime/compiler/pbx.vim
%{_datadir}/nvim/runtime/compiler/perl.vim
+%{_datadir}/nvim/runtime/compiler/perlcritic.vim
%{_datadir}/nvim/runtime/compiler/php.vim
+%{_datadir}/nvim/runtime/compiler/podchecker.vim
%{_datadir}/nvim/runtime/compiler/powershell.vim
%{_datadir}/nvim/runtime/compiler/pylint.vim
%{_datadir}/nvim/runtime/compiler/pyunit.vim
+%{_datadir}/nvim/runtime/compiler/raco.vim
+%{_datadir}/nvim/runtime/compiler/racomake.vim
+%{_datadir}/nvim/runtime/compiler/racosetup.vim
+%{_datadir}/nvim/runtime/compiler/racotest.vim
%{_datadir}/nvim/runtime/compiler/rake.vim
%{_datadir}/nvim/runtime/compiler/rhino.vim
%{_datadir}/nvim/runtime/compiler/rspec.vim
@@ -415,6 +422,8 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/doc/lsp-extension.txt
%{_datadir}/nvim/runtime/doc/lsp.txt
%{_datadir}/nvim/runtime/doc/lua.txt
+%{_datadir}/nvim/runtime/doc/luaref.txt
+%{_datadir}/nvim/runtime/doc/luvref.txt
%{_datadir}/nvim/runtime/doc/makehtml.awk
%{_datadir}/nvim/runtime/doc/maketags.awk
%{_datadir}/nvim/runtime/doc/map.txt
@@ -460,6 +469,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/doc/uganda.txt
%{_datadir}/nvim/runtime/doc/ui.txt
%{_datadir}/nvim/runtime/doc/undo.txt
+%{_datadir}/nvim/runtime/doc/userfunc.txt
%{_datadir}/nvim/runtime/doc/usr_01.txt
%{_datadir}/nvim/runtime/doc/usr_02.txt
%{_datadir}/nvim/runtime/doc/usr_03.txt
@@ -516,6 +526,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/bash.vim
%{_datadir}/nvim/runtime/ftplugin/basic.vim
%{_datadir}/nvim/runtime/ftplugin/bdf.vim
+%{_datadir}/nvim/runtime/ftplugin/bitbake.vim
%{_datadir}/nvim/runtime/ftplugin/bst.vim
%{_datadir}/nvim/runtime/ftplugin/btm.vim
%{_datadir}/nvim/runtime/ftplugin/bzl.vim
@@ -525,6 +536,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/cfg.vim
%{_datadir}/nvim/runtime/ftplugin/ch.vim
%{_datadir}/nvim/runtime/ftplugin/changelog.vim
+%{_datadir}/nvim/runtime/ftplugin/chatito.vim
%{_datadir}/nvim/runtime/ftplugin/checkhealth.vim
%{_datadir}/nvim/runtime/ftplugin/chicken.vim
%{_datadir}/nvim/runtime/ftplugin/clojure.vim
@@ -532,9 +544,11 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/cobol.vim
%{_datadir}/nvim/runtime/ftplugin/conf.vim
%{_datadir}/nvim/runtime/ftplugin/config.vim
+%{_datadir}/nvim/runtime/ftplugin/confini.vim
%{_datadir}/nvim/runtime/ftplugin/context.vim
%{_datadir}/nvim/runtime/ftplugin/cpp.vim
%{_datadir}/nvim/runtime/ftplugin/crm.vim
+%{_datadir}/nvim/runtime/ftplugin/crontab.vim
%{_datadir}/nvim/runtime/ftplugin/cs.vim
%{_datadir}/nvim/runtime/ftplugin/csc.vim
%{_datadir}/nvim/runtime/ftplugin/csh.vim
@@ -544,6 +558,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/debchangelog.vim
%{_datadir}/nvim/runtime/ftplugin/debcontrol.vim
%{_datadir}/nvim/runtime/ftplugin/denyhosts.vim
+%{_datadir}/nvim/runtime/ftplugin/desktop.vim
%{_datadir}/nvim/runtime/ftplugin/dictconf.vim
%{_datadir}/nvim/runtime/ftplugin/dictdconf.vim
%{_datadir}/nvim/runtime/ftplugin/diff.vim
@@ -557,11 +572,14 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/dune.vim
%{_datadir}/nvim/runtime/ftplugin/eiffel.vim
%{_datadir}/nvim/runtime/ftplugin/elinks.vim
+%{_datadir}/nvim/runtime/ftplugin/elixir.vim
%{_datadir}/nvim/runtime/ftplugin/elm.vim
%{_datadir}/nvim/runtime/ftplugin/erlang.vim
%{_datadir}/nvim/runtime/ftplugin/eruby.vim
%{_datadir}/nvim/runtime/ftplugin/eterm.vim
+%{_datadir}/nvim/runtime/ftplugin/expect.vim
%{_datadir}/nvim/runtime/ftplugin/falcon.vim
+%{_datadir}/nvim/runtime/ftplugin/fennel.vim
%{_datadir}/nvim/runtime/ftplugin/fetchmail.vim
%{_datadir}/nvim/runtime/ftplugin/flexwiki.vim
%{_datadir}/nvim/runtime/ftplugin/fortran.vim
@@ -571,8 +589,10 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/fstab.vim
%{_datadir}/nvim/runtime/ftplugin/fvwm.vim
%{_datadir}/nvim/runtime/ftplugin/gdb.vim
+%{_datadir}/nvim/runtime/ftplugin/gitattributes.vim
%{_datadir}/nvim/runtime/ftplugin/gitcommit.vim
%{_datadir}/nvim/runtime/ftplugin/gitconfig.vim
+%{_datadir}/nvim/runtime/ftplugin/gitignore.vim
%{_datadir}/nvim/runtime/ftplugin/gitrebase.vim
%{_datadir}/nvim/runtime/ftplugin/gitsendemail.vim
%{_datadir}/nvim/runtime/ftplugin/go.vim
@@ -581,9 +601,12 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/groovy.vim
%{_datadir}/nvim/runtime/ftplugin/group.vim
%{_datadir}/nvim/runtime/ftplugin/grub.vim
+%{_datadir}/nvim/runtime/ftplugin/gyp.vim
%{_datadir}/nvim/runtime/ftplugin/haml.vim
%{_datadir}/nvim/runtime/ftplugin/hamster.vim
+%{_datadir}/nvim/runtime/ftplugin/hare.vim
%{_datadir}/nvim/runtime/ftplugin/haskell.vim
+%{_datadir}/nvim/runtime/ftplugin/heex.vim
%{_datadir}/nvim/runtime/ftplugin/help.vim
%{_datadir}/nvim/runtime/ftplugin/hgcommit.vim
%{_datadir}/nvim/runtime/ftplugin/hog.vim
@@ -592,6 +615,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/html.vim
%{_datadir}/nvim/runtime/ftplugin/htmldjango.vim
%{_datadir}/nvim/runtime/ftplugin/i3config.vim
+%{_datadir}/nvim/runtime/ftplugin/icon.vim
%{_datadir}/nvim/runtime/ftplugin/indent.vim
%{_datadir}/nvim/runtime/ftplugin/initex.vim
%{_datadir}/nvim/runtime/ftplugin/ishd.vim
@@ -602,6 +626,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/jproperties.vim
%{_datadir}/nvim/runtime/ftplugin/json.vim
%{_datadir}/nvim/runtime/ftplugin/jsonc.vim
+%{_datadir}/nvim/runtime/ftplugin/jsonnet.vim
%{_datadir}/nvim/runtime/ftplugin/jsp.vim
%{_datadir}/nvim/runtime/ftplugin/julia.vim
%{_datadir}/nvim/runtime/ftplugin/kconfig.vim
@@ -619,7 +644,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/logtalk.dict
%{_datadir}/nvim/runtime/ftplugin/logtalk.vim
%{_datadir}/nvim/runtime/ftplugin/lprolog.vim
+%{_datadir}/nvim/runtime/ftplugin/lua.lua
%{_datadir}/nvim/runtime/ftplugin/lua.vim
+%{_datadir}/nvim/runtime/ftplugin/lynx.vim
%{_datadir}/nvim/runtime/ftplugin/m3build.vim
%{_datadir}/nvim/runtime/ftplugin/m3quake.vim
%{_datadir}/nvim/runtime/ftplugin/m4.vim
@@ -662,6 +689,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/php.vim
%{_datadir}/nvim/runtime/ftplugin/pinfo.vim
%{_datadir}/nvim/runtime/ftplugin/plaintex.vim
+%{_datadir}/nvim/runtime/ftplugin/pod.vim
%{_datadir}/nvim/runtime/ftplugin/poke.vim
%{_datadir}/nvim/runtime/ftplugin/postscr.vim
%{_datadir}/nvim/runtime/ftplugin/procmail.vim
@@ -672,11 +700,12 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/pyrex.vim
%{_datadir}/nvim/runtime/ftplugin/python.vim
%{_datadir}/nvim/runtime/ftplugin/qb64.vim
-%{_datadir}/nvim/runtime/ftplugin/query.lua
%{_datadir}/nvim/runtime/ftplugin/qf.vim
%{_datadir}/nvim/runtime/ftplugin/quake.vim
+%{_datadir}/nvim/runtime/ftplugin/query.lua
%{_datadir}/nvim/runtime/ftplugin/r.vim
%{_datadir}/nvim/runtime/ftplugin/racc.vim
+%{_datadir}/nvim/runtime/ftplugin/racket.vim
%{_datadir}/nvim/runtime/ftplugin/raku.vim
%{_datadir}/nvim/runtime/ftplugin/readline.vim
%{_datadir}/nvim/runtime/ftplugin/registry.vim
@@ -694,9 +723,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/sass.vim
%{_datadir}/nvim/runtime/ftplugin/sbt.vim
%{_datadir}/nvim/runtime/ftplugin/scala.vim
+%{_datadir}/nvim/runtime/ftplugin/scdoc.vim
%{_datadir}/nvim/runtime/ftplugin/scheme.vim
%{_datadir}/nvim/runtime/ftplugin/screen.vim
-%{_datadir}/nvim/runtime/ftplugin/scdoc.vim
%{_datadir}/nvim/runtime/ftplugin/scss.vim
%{_datadir}/nvim/runtime/ftplugin/sensors.vim
%{_datadir}/nvim/runtime/ftplugin/services.vim
@@ -715,19 +744,21 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/sshconfig.vim
%{_datadir}/nvim/runtime/ftplugin/sudoers.vim
%{_datadir}/nvim/runtime/ftplugin/svg.vim
+%{_datadir}/nvim/runtime/ftplugin/swayconfig.vim
%{_datadir}/nvim/runtime/ftplugin/swift.vim
%{_datadir}/nvim/runtime/ftplugin/swiftgyb.vim
%{_datadir}/nvim/runtime/ftplugin/sysctl.vim
%{_datadir}/nvim/runtime/ftplugin/systemd.vim
%{_datadir}/nvim/runtime/ftplugin/systemverilog.vim
+%{_datadir}/nvim/runtime/ftplugin/tap.vim
%{_datadir}/nvim/runtime/ftplugin/tcl.vim
%{_datadir}/nvim/runtime/ftplugin/tcsh.vim
%{_datadir}/nvim/runtime/ftplugin/terminfo.vim
%{_datadir}/nvim/runtime/ftplugin/tex.vim
%{_datadir}/nvim/runtime/ftplugin/text.vim
%{_datadir}/nvim/runtime/ftplugin/tidy.vim
-%{_datadir}/nvim/runtime/ftplugin/toml.vim
%{_datadir}/nvim/runtime/ftplugin/tmux.vim
+%{_datadir}/nvim/runtime/ftplugin/toml.vim
%{_datadir}/nvim/runtime/ftplugin/treetop.vim
%{_datadir}/nvim/runtime/ftplugin/tt2html.vim
%{_datadir}/nvim/runtime/ftplugin/tutor.vim
@@ -738,11 +769,15 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/ftplugin/udevrules.vim
%{_datadir}/nvim/runtime/ftplugin/updatedb.vim
%{_datadir}/nvim/runtime/ftplugin/vb.vim
+%{_datadir}/nvim/runtime/ftplugin/vdf.vim
%{_datadir}/nvim/runtime/ftplugin/verilog.vim
%{_datadir}/nvim/runtime/ftplugin/vhdl.vim
%{_datadir}/nvim/runtime/ftplugin/vim.vim
%{_datadir}/nvim/runtime/ftplugin/vroom.vim
+%{_datadir}/nvim/runtime/ftplugin/vue.vim
%{_datadir}/nvim/runtime/ftplugin/wast.vim
+%{_datadir}/nvim/runtime/ftplugin/wget.vim
+%{_datadir}/nvim/runtime/ftplugin/wget2.vim
%{_datadir}/nvim/runtime/ftplugin/xdefaults.vim
%{_datadir}/nvim/runtime/ftplugin/xf86conf.vim
%{_datadir}/nvim/runtime/ftplugin/xhtml.vim
@@ -762,8 +797,10 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/ant.vim
%{_datadir}/nvim/runtime/indent/automake.vim
%{_datadir}/nvim/runtime/indent/awk.vim
+%{_datadir}/nvim/runtime/indent/bash.vim
%{_datadir}/nvim/runtime/indent/basic.vim
%{_datadir}/nvim/runtime/indent/bib.vim
+%{_datadir}/nvim/runtime/indent/bitbake.vim
%{_datadir}/nvim/runtime/indent/bst.vim
%{_datadir}/nvim/runtime/indent/bzl.vim
%{_datadir}/nvim/runtime/indent/c.vim
@@ -771,6 +808,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/ch.vim
%{_datadir}/nvim/runtime/indent/chaiscript.vim
%{_datadir}/nvim/runtime/indent/changelog.vim
+%{_datadir}/nvim/runtime/indent/chatito.vim
%{_datadir}/nvim/runtime/indent/clojure.vim
%{_datadir}/nvim/runtime/indent/cmake.vim
%{_datadir}/nvim/runtime/indent/cobol.vim
@@ -788,20 +826,26 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/dosbatch.vim
%{_datadir}/nvim/runtime/indent/dtd.vim
%{_datadir}/nvim/runtime/indent/dtrace.vim
+%{_datadir}/nvim/runtime/indent/dune.vim
%{_datadir}/nvim/runtime/indent/dylan.vim
%{_datadir}/nvim/runtime/indent/eiffel.vim
+%{_datadir}/nvim/runtime/indent/elm.vim
%{_datadir}/nvim/runtime/indent/erlang.vim
%{_datadir}/nvim/runtime/indent/eruby.vim
%{_datadir}/nvim/runtime/indent/eterm.vim
+%{_datadir}/nvim/runtime/indent/expect.vim
%{_datadir}/nvim/runtime/indent/falcon.vim
+%{_datadir}/nvim/runtime/indent/fennel.vim
%{_datadir}/nvim/runtime/indent/fortran.vim
%{_datadir}/nvim/runtime/indent/framescript.vim
%{_datadir}/nvim/runtime/indent/freebasic.vim
%{_datadir}/nvim/runtime/indent/gitconfig.vim
%{_datadir}/nvim/runtime/indent/gitolite.vim
%{_datadir}/nvim/runtime/indent/go.vim
+%{_datadir}/nvim/runtime/indent/gyp.vim
%{_datadir}/nvim/runtime/indent/haml.vim
%{_datadir}/nvim/runtime/indent/hamster.vim
+%{_datadir}/nvim/runtime/indent/hare.vim
%{_datadir}/nvim/runtime/indent/hog.vim
%{_datadir}/nvim/runtime/indent/html.vim
%{_datadir}/nvim/runtime/indent/htmldjango.vim
@@ -815,6 +859,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/jsonc.vim
%{_datadir}/nvim/runtime/indent/jsp.vim
%{_datadir}/nvim/runtime/indent/julia.vim
+%{_datadir}/nvim/runtime/indent/krl.vim
%{_datadir}/nvim/runtime/indent/ld.vim
%{_datadir}/nvim/runtime/indent/less.vim
%{_datadir}/nvim/runtime/indent/lifelines.vim
@@ -825,6 +870,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/mail.vim
%{_datadir}/nvim/runtime/indent/make.vim
%{_datadir}/nvim/runtime/indent/matlab.vim
+%{_datadir}/nvim/runtime/indent/meson.vim
%{_datadir}/nvim/runtime/indent/mf.vim
%{_datadir}/nvim/runtime/indent/mma.vim
%{_datadir}/nvim/runtime/indent/mp.vim
@@ -839,11 +885,14 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/postscr.vim
%{_datadir}/nvim/runtime/indent/pov.vim
%{_datadir}/nvim/runtime/indent/prolog.vim
+%{_datadir}/nvim/runtime/indent/ps1.vim
%{_datadir}/nvim/runtime/indent/pyrex.vim
%{_datadir}/nvim/runtime/indent/python.vim
%{_datadir}/nvim/runtime/indent/qb64.vim
%{_datadir}/nvim/runtime/indent/query.lua
%{_datadir}/nvim/runtime/indent/r.vim
+%{_datadir}/nvim/runtime/indent/racket.vim
+%{_datadir}/nvim/runtime/indent/raku.vim
%{_datadir}/nvim/runtime/indent/raml.vim
%{_datadir}/nvim/runtime/indent/readline.vim
%{_datadir}/nvim/runtime/indent/rhelp.vim
@@ -862,9 +911,10 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/sdl.vim
%{_datadir}/nvim/runtime/indent/sh.vim
%{_datadir}/nvim/runtime/indent/sml.vim
+%{_datadir}/nvim/runtime/indent/solidity.vim
%{_datadir}/nvim/runtime/indent/sql.vim
%{_datadir}/nvim/runtime/indent/sqlanywhere.vim
-%{_datadir}/nvim/runtime/indent/systemd.vim
+%{_datadir}/nvim/runtime/indent/sshconfig.vim
%{_datadir}/nvim/runtime/indent/systemverilog.vim
%{_datadir}/nvim/runtime/indent/tcl.vim
%{_datadir}/nvim/runtime/indent/tcsh.vim
@@ -879,6 +929,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/vhdl.vim
%{_datadir}/nvim/runtime/indent/vim.vim
%{_datadir}/nvim/runtime/indent/vroom.vim
+%{_datadir}/nvim/runtime/indent/vue.vim
%{_datadir}/nvim/runtime/indent/wast.vim
%{_datadir}/nvim/runtime/indent/xf86conf.vim
%{_datadir}/nvim/runtime/indent/xhtml.vim
@@ -890,13 +941,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/indent/yaml.vim
%{_datadir}/nvim/runtime/indent/zimbu.vim
%{_datadir}/nvim/runtime/indent/zsh.vim
-%{_datadir}/nvim/runtime/indent/bash.vim
-%{_datadir}/nvim/runtime/indent/dune.vim
-%{_datadir}/nvim/runtime/indent/elm.vim
-%{_datadir}/nvim/runtime/indent/meson.vim
-%{_datadir}/nvim/runtime/indent/ps1.vim
-%{_datadir}/nvim/runtime/indent/raku.vim
-%{_datadir}/nvim/runtime/indent/sshconfig.vim
%dir %{_datadir}/nvim/runtime/indent/testdir/
%{_datadir}/nvim/runtime/indent/testdir/runtest.vim
@@ -993,9 +1037,10 @@ 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/_meta.lua
-%{_datadir}/nvim/runtime/lua/vim/compat.lua
%{_datadir}/nvim/runtime/lua/vim/diagnostic.lua
%{_datadir}/nvim/runtime/lua/vim/filetype.lua
+%{_datadir}/nvim/runtime/lua/vim/fs.lua
+%{_datadir}/nvim/runtime/lua/vim/health.lua
%{_datadir}/nvim/runtime/lua/vim/highlight.lua
%{_datadir}/nvim/runtime/lua/vim/inspect.lua
%{_datadir}/nvim/runtime/lua/vim/keymap.lua
@@ -1005,6 +1050,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/lua/vim/ui.lua
%{_datadir}/nvim/runtime/lua/vim/uri.lua
+%dir %{_datadir}/nvim/runtime/lua/vim/filetype/
+%{_datadir}/nvim/runtime/lua/vim/filetype/detect.lua
+
%dir %{_datadir}/nvim/runtime/lua/vim/lsp/
%{_datadir}/nvim/runtime/lua/vim/lsp/_snippet.lua
%{_datadir}/nvim/runtime/lua/vim/lsp/buf.lua
@@ -1083,7 +1131,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%dir %{_datadir}/nvim/runtime/plugin
%{_datadir}/nvim/runtime/plugin/gzip.vim
%{_datadir}/nvim/runtime/plugin/health.vim
-%{_datadir}/nvim/runtime/plugin/man.vim
+%{_datadir}/nvim/runtime/plugin/man.lua
%{_datadir}/nvim/runtime/plugin/matchit.vim
%{_datadir}/nvim/runtime/plugin/matchparen.vim
%{_datadir}/nvim/runtime/plugin/netrwPlugin.vim
@@ -1128,6 +1176,22 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/print/mac-roman.ps
%{_datadir}/nvim/runtime/print/prolog.ps
+%dir %{_datadir}/nvim/runtime/queries/
+%dir %{_datadir}/nvim/runtime/queries/c/
+%{_datadir}/nvim/runtime/queries/c/highlights.scm
+%{_datadir}/nvim/runtime/queries/c/injections.scm
+
+%dir %{_datadir}/nvim/runtime/queries/help/
+%{_datadir}/nvim/runtime/queries/help/highlights.scm
+
+%dir %{_datadir}/nvim/runtime/queries/lua/
+%{_datadir}/nvim/runtime/queries/lua/highlights.scm
+%{_datadir}/nvim/runtime/queries/lua/injections.scm
+
+%dir %{_datadir}/nvim/runtime/queries/vim/
+%{_datadir}/nvim/runtime/queries/vim/highlights.scm
+%{_datadir}/nvim/runtime/queries/vim/injections.scm
+
%dir %{_datadir}/nvim/runtime/spell
%{_datadir}/nvim/runtime/spell/cleanadd.vim
%{_datadir}/nvim/runtime/spell/en.utf-8.spl
@@ -1185,6 +1249,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/bdf.vim
%{_datadir}/nvim/runtime/syntax/bib.vim
%{_datadir}/nvim/runtime/syntax/bindzone.vim
+%{_datadir}/nvim/runtime/syntax/bitbake.vim
%{_datadir}/nvim/runtime/syntax/blank.vim
%{_datadir}/nvim/runtime/syntax/bsdl.vim
%{_datadir}/nvim/runtime/syntax/bst.vim
@@ -1207,6 +1272,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/change.vim
%{_datadir}/nvim/runtime/syntax/changelog.vim
%{_datadir}/nvim/runtime/syntax/chaskell.vim
+%{_datadir}/nvim/runtime/syntax/chatito.vim
%{_datadir}/nvim/runtime/syntax/checkhealth.vim
%{_datadir}/nvim/runtime/syntax/cheetah.vim
%{_datadir}/nvim/runtime/syntax/chicken.vim
@@ -1225,6 +1291,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/conaryrecipe.vim
%{_datadir}/nvim/runtime/syntax/conf.vim
%{_datadir}/nvim/runtime/syntax/config.vim
+%{_datadir}/nvim/runtime/syntax/confini.vim
%{_datadir}/nvim/runtime/syntax/context.vim
%{_datadir}/nvim/runtime/syntax/cpp.vim
%{_datadir}/nvim/runtime/syntax/crm.vim
@@ -1326,12 +1393,17 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/fvwm2m4.vim
%{_datadir}/nvim/runtime/syntax/gdb.vim
%{_datadir}/nvim/runtime/syntax/gdmo.vim
+%{_datadir}/nvim/runtime/syntax/gdresource.vim
+%{_datadir}/nvim/runtime/syntax/gdscript.vim
+%{_datadir}/nvim/runtime/syntax/gdshader.vim
%{_datadir}/nvim/runtime/syntax/gedcom.vim
%{_datadir}/nvim/runtime/syntax/gemtext.vim
%{_datadir}/nvim/runtime/syntax/gift.vim
%{_datadir}/nvim/runtime/syntax/git.vim
+%{_datadir}/nvim/runtime/syntax/gitattributes.vim
%{_datadir}/nvim/runtime/syntax/gitcommit.vim
%{_datadir}/nvim/runtime/syntax/gitconfig.vim
+%{_datadir}/nvim/runtime/syntax/gitignore.vim
%{_datadir}/nvim/runtime/syntax/gitolite.vim
%{_datadir}/nvim/runtime/syntax/gitrebase.vim
%{_datadir}/nvim/runtime/syntax/gitsendemail.vim
@@ -1352,8 +1424,10 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/gsp.vim
%{_datadir}/nvim/runtime/syntax/gtkrc.vim
%{_datadir}/nvim/runtime/syntax/gvpr.vim
+%{_datadir}/nvim/runtime/syntax/gyp.vim
%{_datadir}/nvim/runtime/syntax/haml.vim
%{_datadir}/nvim/runtime/syntax/hamster.vim
+%{_datadir}/nvim/runtime/syntax/hare.vim
%{_datadir}/nvim/runtime/syntax/haskell.vim
%{_datadir}/nvim/runtime/syntax/haste.vim
%{_datadir}/nvim/runtime/syntax/hastepreproc.vim
@@ -1364,6 +1438,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/hex.vim
%{_datadir}/nvim/runtime/syntax/hgcommit.vim
%{_datadir}/nvim/runtime/syntax/hitest.vim
+%{_datadir}/nvim/runtime/syntax/hlsplaylist.vim
%{_datadir}/nvim/runtime/syntax/hog.vim
%{_datadir}/nvim/runtime/syntax/hollywood.vim
%{_datadir}/nvim/runtime/syntax/hostconf.vim
@@ -1408,6 +1483,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/kconfig.vim
%{_datadir}/nvim/runtime/syntax/kivy.vim
%{_datadir}/nvim/runtime/syntax/kix.vim
+%{_datadir}/nvim/runtime/syntax/krl.vim
%{_datadir}/nvim/runtime/syntax/kscript.vim
%{_datadir}/nvim/runtime/syntax/kwt.vim
%{_datadir}/nvim/runtime/syntax/lace.vim
@@ -1440,6 +1516,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/lss.vim
%{_datadir}/nvim/runtime/syntax/lua.vim
%{_datadir}/nvim/runtime/syntax/lynx.vim
+%{_datadir}/nvim/runtime/syntax/lyrics.vim
%{_datadir}/nvim/runtime/syntax/m3build.vim
%{_datadir}/nvim/runtime/syntax/m3quake.vim
%{_datadir}/nvim/runtime/syntax/m4.vim
@@ -1511,6 +1588,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/omnimark.vim
%{_datadir}/nvim/runtime/syntax/opam.vim
%{_datadir}/nvim/runtime/syntax/openroad.vim
+%{_datadir}/nvim/runtime/syntax/openscad.vim
%{_datadir}/nvim/runtime/syntax/opl.vim
%{_datadir}/nvim/runtime/syntax/ora.vim
%{_datadir}/nvim/runtime/syntax/pamconf.vim
@@ -1562,11 +1640,12 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/pyrex.vim
%{_datadir}/nvim/runtime/syntax/python.vim
%{_datadir}/nvim/runtime/syntax/qb64.vim
-%{_datadir}/nvim/runtime/syntax/query.lua
%{_datadir}/nvim/runtime/syntax/qf.vim
%{_datadir}/nvim/runtime/syntax/quake.vim
+%{_datadir}/nvim/runtime/syntax/query.lua
%{_datadir}/nvim/runtime/syntax/r.vim
%{_datadir}/nvim/runtime/syntax/racc.vim
+%{_datadir}/nvim/runtime/syntax/racket.vim
%{_datadir}/nvim/runtime/syntax/radiance.vim
%{_datadir}/nvim/runtime/syntax/raku.vim
%{_datadir}/nvim/runtime/syntax/raml.vim
@@ -1590,8 +1669,8 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/rng.vim
%{_datadir}/nvim/runtime/syntax/rnoweb.vim
%{_datadir}/nvim/runtime/syntax/robots.vim
-%{_datadir}/nvim/runtime/syntax/rpcgen.vim
%{_datadir}/nvim/runtime/syntax/routeros.vim
+%{_datadir}/nvim/runtime/syntax/rpcgen.vim
%{_datadir}/nvim/runtime/syntax/rpl.vim
%{_datadir}/nvim/runtime/syntax/rrst.vim
%{_datadir}/nvim/runtime/syntax/rst.vim
@@ -1604,11 +1683,11 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/sather.vim
%{_datadir}/nvim/runtime/syntax/sbt.vim
%{_datadir}/nvim/runtime/syntax/scala.vim
+%{_datadir}/nvim/runtime/syntax/scdoc.vim
%{_datadir}/nvim/runtime/syntax/scheme.vim
%{_datadir}/nvim/runtime/syntax/scilab.vim
%{_datadir}/nvim/runtime/syntax/screen.vim
%{_datadir}/nvim/runtime/syntax/scss.vim
-%{_datadir}/nvim/runtime/syntax/scdoc.vim
%{_datadir}/nvim/runtime/syntax/sd.vim
%{_datadir}/nvim/runtime/syntax/sdc.vim
%{_datadir}/nvim/runtime/syntax/sdl.vim
@@ -1623,6 +1702,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/sgmllnx.vim
%{_datadir}/nvim/runtime/syntax/sh.vim
%{_datadir}/nvim/runtime/syntax/shada.vim
+%{_datadir}/nvim/runtime/syntax/shared/typescriptcommon.vim
%{_datadir}/nvim/runtime/syntax/sicad.vim
%{_datadir}/nvim/runtime/syntax/sieve.vim
%{_datadir}/nvim/runtime/syntax/sil.vim
@@ -1650,6 +1730,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/snnspat.vim
%{_datadir}/nvim/runtime/syntax/snnsres.vim
%{_datadir}/nvim/runtime/syntax/snobol4.vim
+%{_datadir}/nvim/runtime/syntax/solidity.vim
%{_datadir}/nvim/runtime/syntax/spec.vim
%{_datadir}/nvim/runtime/syntax/specman.vim
%{_datadir}/nvim/runtime/syntax/spice.vim
@@ -1667,6 +1748,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/squid.vim
%{_datadir}/nvim/runtime/syntax/squirrel.vim
%{_datadir}/nvim/runtime/syntax/srec.vim
+%{_datadir}/nvim/runtime/syntax/srt.vim
%{_datadir}/nvim/runtime/syntax/sshconfig.vim
%{_datadir}/nvim/runtime/syntax/sshdconfig.vim
%{_datadir}/nvim/runtime/syntax/st.vim
@@ -1677,6 +1759,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/sudoers.vim
%{_datadir}/nvim/runtime/syntax/svg.vim
%{_datadir}/nvim/runtime/syntax/svn.vim
+%{_datadir}/nvim/runtime/syntax/swayconfig.vim
%{_datadir}/nvim/runtime/syntax/swift.vim
%{_datadir}/nvim/runtime/syntax/swiftgyb.vim
%{_datadir}/nvim/runtime/syntax/synload.vim
@@ -1721,7 +1804,6 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/tt2js.vim
%{_datadir}/nvim/runtime/syntax/tutor.vim
%{_datadir}/nvim/runtime/syntax/typescript.vim
-%{_datadir}/nvim/runtime/syntax/typescriptcommon.vim
%{_datadir}/nvim/runtime/syntax/typescriptreact.vim
%{_datadir}/nvim/runtime/syntax/uc.vim
%{_datadir}/nvim/runtime/syntax/udevconf.vim
@@ -1738,6 +1820,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/usw2kagtlog.vim
%{_datadir}/nvim/runtime/syntax/valgrind.vim
%{_datadir}/nvim/runtime/syntax/vb.vim
+%{_datadir}/nvim/runtime/syntax/vdf.vim
%{_datadir}/nvim/runtime/syntax/vera.vim
%{_datadir}/nvim/runtime/syntax/verilog.vim
%{_datadir}/nvim/runtime/syntax/verilogams.vim
@@ -1758,6 +1841,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/syntax/web.vim
%{_datadir}/nvim/runtime/syntax/webmacro.vim
%{_datadir}/nvim/runtime/syntax/wget.vim
+%{_datadir}/nvim/runtime/syntax/wget2.vim
%{_datadir}/nvim/runtime/syntax/whitespace.vim
%{_datadir}/nvim/runtime/syntax/winbatch.vim
%{_datadir}/nvim/runtime/syntax/wml.vim
@@ -1791,6 +1875,7 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%dir %{_datadir}/nvim/runtime/tools
%{_datadir}/nvim/runtime/tools/check_colors.vim
+%{_datadir}/nvim/runtime/tools/emoji_list.vim
%dir %{_datadir}/nvim/runtime/tutor
%{_datadir}/nvim/runtime/tutor/tutor.tutor
@@ -1801,6 +1886,9 @@ find %{buildroot}%{_datadir} \( -name "*.bat" -o -name "*.awk" \) \
%{_datadir}/nvim/runtime/tutor/en/vim-01-beginner.tutor.json
%changelog
+* Fri Sep 30 2022 Andreas Schneider <asn(a)redhat.com> - 0.8.0-1
+- Update to version 0.8.0
+
* Wed Sep 21 2022 Andreas Schneider <asn(a)redhat.com> - 0.7.2-4
- Build with libvterm 0.3
diff --git a/sources b/sources
index 9a6fc6b..748a022 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neovim-0.7.2.tar.gz) = 04d0fa5b23018531b70b53271821bf6944cde1bcec2210b99f5888e1339cd38f57feaa8e40874a3a504930e6614980947f31852185cbcd2ce106a0867896dd79
+SHA512 (neovim-0.8.0.tar.gz) = e9504e33df292043656b0ef064e465069c93d4be52bbe29ec33c111f3e00ed83647148d653e3f143e2243dac537eede6a9351990bd858ac20abc8edbc5249432
https://src.fedoraproject.org/rpms/neovim/c/42decb69fad1e5bef9f0561a34772...
1Â year, 6Â months
kalev pushed to gspell (f37). "Update to 1.12.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:30:03 UTC
From f1ebde2045bdc77aeae642ceedacc766e3d130a0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember(a)redhat.com>
Date: Sep 30 2022 21:29:42 +0000
Subject: Update to 1.12.0
---
diff --git a/.gitignore b/.gitignore
index 1dec0f7..7839f97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
/gspell-1.9.1.tar.xz
/gspell-1.10.0.tar.xz
/gspell-1.11.1.tar.xz
+/gspell-1.12.0.tar.xz
diff --git a/gspell.spec b/gspell.spec
index 0cc1d48..ef9e2e2 100644
--- a/gspell.spec
+++ b/gspell.spec
@@ -2,13 +2,13 @@
%global gtk3_version 3.20
Name: gspell
-Version: 1.11.1
-Release: 3%{?dist}
+Version: 1.12.0
+Release: 1%{?dist}
Summary: Spell-checking library for GTK+
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/gspell
-Source0: https://download.gnome.org/sources/%{name}/1.11/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/1.12/%{name}-%{version}.tar.xz
BuildRequires: gettext
BuildRequires: gobject-introspection-devel
@@ -84,6 +84,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog
+* Fri Sep 30 2022 Kalev Lember <klember(a)redhat.com> - 1.12.0-1
+- Update to 1.12.0
+
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 1.11.1-3
- Rebuilt for ICU 71.1
diff --git a/sources b/sources
index 3e41d23..ada28dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gspell-1.11.1.tar.xz) = df13ef76340b3f644b517f05941c4a11f90212511229a4644cda0d605af428222bf7dd15dbdf51da80e07b7689249728f5739020349226b78d1990707f9706d9
+SHA512 (gspell-1.12.0.tar.xz) = 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549
https://src.fedoraproject.org/rpms/gspell/c/f1ebde2045bdc77aeae642ceedacc...
1Â year, 6Â months
kalev pushed to gspell (rawhide). "Update to 1.12.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:29:46 UTC
From f1ebde2045bdc77aeae642ceedacc766e3d130a0 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember(a)redhat.com>
Date: Sep 30 2022 21:29:42 +0000
Subject: Update to 1.12.0
---
diff --git a/.gitignore b/.gitignore
index 1dec0f7..7839f97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
/gspell-1.9.1.tar.xz
/gspell-1.10.0.tar.xz
/gspell-1.11.1.tar.xz
+/gspell-1.12.0.tar.xz
diff --git a/gspell.spec b/gspell.spec
index 0cc1d48..ef9e2e2 100644
--- a/gspell.spec
+++ b/gspell.spec
@@ -2,13 +2,13 @@
%global gtk3_version 3.20
Name: gspell
-Version: 1.11.1
-Release: 3%{?dist}
+Version: 1.12.0
+Release: 1%{?dist}
Summary: Spell-checking library for GTK+
License: LGPLv2+
URL: https://wiki.gnome.org/Projects/gspell
-Source0: https://download.gnome.org/sources/%{name}/1.11/%{name}-%{version}.tar.xz
+Source0: https://download.gnome.org/sources/%{name}/1.12/%{name}-%{version}.tar.xz
BuildRequires: gettext
BuildRequires: gobject-introspection-devel
@@ -84,6 +84,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%changelog
+* Fri Sep 30 2022 Kalev Lember <klember(a)redhat.com> - 1.12.0-1
+- Update to 1.12.0
+
* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk(a)redhat.com> - 1.11.1-3
- Rebuilt for ICU 71.1
diff --git a/sources b/sources
index 3e41d23..ada28dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gspell-1.11.1.tar.xz) = df13ef76340b3f644b517f05941c4a11f90212511229a4644cda0d605af428222bf7dd15dbdf51da80e07b7689249728f5739020349226b78d1990707f9706d9
+SHA512 (gspell-1.12.0.tar.xz) = 7a9fea40c6b8298c48ee48cb6f67d66b0a950fd4d7902ffce0d2f620270614ea01b7ada0adba6778090b16f4561625aea6f39de76b743b2cd06a61a24520c549
https://src.fedoraproject.org/rpms/gspell/c/f1ebde2045bdc77aeae642ceedacc...
1Â year, 6Â months
fab pushed to python-graphql-relay (rawhide). "Update to latest
upstream release 3.2.0 (closes rhbz#2043703)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:16:19 UTC
From 28e9abe0713bdd2133080ab5fb54fec6a6b9ada9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail(a)fabian-affolter.ch>
Date: Sep 30 2022 21:16:08 +0000
Subject: Update to latest upstream release 3.2.0 (closes rhbz#2043703)
---
diff --git a/.gitignore b/.gitignore
index 9bca6f2..92444b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/graphql-relay-3.0.0.tar.gz
/graphql-relay-3.1.0.tar.gz
+/graphql-relay-3.2.0.tar.gz
diff --git a/python-graphql-relay.spec b/python-graphql-relay.spec
index 2408386..946ba0d 100644
--- a/python-graphql-relay.spec
+++ b/python-graphql-relay.spec
@@ -1,13 +1,13 @@
%global pypi_name graphql-relay
Name: python-%{pypi_name}
-Version: 3.1.0
-Release: 6%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
Summary: Relay library for Graphql
License: MIT
URL: https://github.com/graphql-python/graphql-relay-py
-Source0: %{pypi_source}
+Source0: %{url}/archive/v%{version}/%{pypi_name}-%{version}.tar.gz
BuildArch: noarch
%description
@@ -31,7 +31,7 @@ GraphQL-relay is the Relay library for GraphQL-core implemented in Python.
It allows the easy creation of Relay-compliant servers using GraphQL-core.
%prep
-%autosetup -n %{pypi_name}-%{version}
+%autosetup -n %{pypi_name}-py-%{version}
rm -rf %{pypi_name}.egg-info
%build
@@ -40,8 +40,8 @@ rm -rf %{pypi_name}.egg-info
%install
%py3_install
-%check
-PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests
+#%%check
+#%%pytest -v tests
%files -n python3-%{pypi_name}
%license LICENSE
@@ -50,6 +50,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} pytest-%{python3_version} -v tests
%{python3_sitelib}/graphql_relay-%{version}-py%{python3_version}.egg-info
%changelog
+* Wed Sep 28 2022 Fabian Affolter <mail(a)fabian-affolter.ch> - 3.2.0-1
+- Update to latest upstream release 3.2.0 (closes rhbz#2043703)
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index ee6bc3e..aeb65e3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (graphql-relay-3.1.0.tar.gz) = 7006da1ebd0a7fde2a88b6c03d2355d1cc26b14e86f51387cd91c922b498f2fcbe120af730b9634b57af0b638244fb464808e7af16e2dfdae9fa71f404bb5d65
+SHA512 (graphql-relay-3.2.0.tar.gz) = c3f269af5b7b623dc5261825253e7f6d8246e37bcbf26f1958f2a9d1383edeb205c11f0ca85ccb9d5b032fabab2ff50f91d8bb88343b85bdc0a2aca477063695
https://src.fedoraproject.org/rpms/python-graphql-relay/c/28e9abe0713bdd2...
1Â year, 6Â months
kalev pushed to geary (f37). "Update to 43.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:14:52 UTC
From e07930fffbd0cd4d124c1edf5ab69f2585cf9166 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember(a)redhat.com>
Date: Sep 30 2022 21:13:56 +0000
Subject: Update to 43.0
---
diff --git a/0f75e7a8.patch b/0f75e7a8.patch
deleted file mode 100644
index 390cc5b..0000000
--- a/0f75e7a8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 0f75e7a84a39492d0748cec2ba6028e08cae3644
-Author: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Sun Jan 30 19:54:11 2022
-
- Util.Cache.Lru: Workaround missing generic type argument
-
-diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
-index f054e32e5..ecc275e84 100644
---- a/src/client/util/util-cache.vala
-+++ b/src/client/util/util-cache.vala
-@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
-+ public static int lru_compare(CacheEntry a, CacheEntry b) {
- if (a.key == b.key) {
- return 0;
- }
diff --git a/1c1912d0.patch b/1c1912d0.patch
deleted file mode 100644
index a7310d2..0000000
--- a/1c1912d0.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 1c1912d0061bb59525b870767d08b16c09acc8da Mon Sep 17 00:00:00 2001
-From: Michael Gratton <mike(a)vee.net>
-Date: Sat, 15 May 2021 22:14:49 +1000
-Subject: [PATCH] build: Remove explicit libsoup dependency
-
-Replace all uses of libsoup with their GLib equivalents, and remove the
-build dependency.
-
-See GNOME/gnome-build-meta#378
----
- meson.build | 1 -
- src/client/components/components-web-view.vala | 5 +----
- src/client/composer/composer-link-popover.vala | 10 +++++++---
- .../conversation-viewer/conversation-message.vala | 8 ++++----
- src/client/meson.build | 1 -
- src/client/plugin/meson.build | 1 -
- src/client/web-process/web-process-extension.vala | 7 ++++++-
- src/meson.build | 1 -
- 8 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d0af9eef8..233e8c56b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -95,7 +95,6 @@ libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
- libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
- libsecret = dependency('libsecret-1', version: '>= 0.11')
- libstemmer_dep = cc.find_library('stemmer')
--libsoup = dependency('libsoup-2.4', version: '>= 2.48')
- libunwind_dep = dependency(
- 'libunwind', version: '>= 1.1', required: get_option('libunwind')
- )
-diff --git a/src/client/components/components-web-view.vala b/src/client/components/components-web-view.vala
-index fe3c036d2..4ec857f92 100644
---- a/src/client/components/components-web-view.vala
-+++ b/src/client/components/components-web-view.vala
-@@ -696,7 +696,7 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
- }
-
- private bool handle_internal_response(WebKit.URISchemeRequest request) {
-- string name = soup_uri_decode(request.get_path());
-+ string name = GLib.Uri.unescape_string(request.get_path());
- Geary.Memory.Buffer? buf = this.internal_resources[name];
- bool handled = false;
- if (buf != null) {
-@@ -853,6 +853,3 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
- }
-
- }
--
--// XXX this needs to be moved into the libsoup bindings
--extern string soup_uri_decode(string part);
-diff --git a/src/client/composer/composer-link-popover.vala b/src/client/composer/composer-link-popover.vala
-index 63ec71ee5..c4bc3d963 100644
---- a/src/client/composer/composer-link-popover.vala
-+++ b/src/client/composer/composer-link-popover.vala
-@@ -52,7 +52,7 @@ public class Composer.LinkPopover : Gtk.Popover {
-
-
- /** Emitted when the link URL has changed. */
-- public signal void link_changed(Soup.URI? uri, bool is_valid);
-+ public signal void link_changed(GLib.Uri? uri, bool is_valid);
-
- /** Emitted when the link URL was activated. */
- public signal void link_activate();
-@@ -99,9 +99,13 @@ public class Composer.LinkPopover : Gtk.Popover {
- bool is_valid = false;
- bool is_nominal = false;
- bool is_mailto = false;
-- Soup.URI? url = null;
-+ GLib.Uri? url = null;
- if (!is_empty) {
-- url = new Soup.URI(text);
-+ try {
-+ url = GLib.Uri.parse(text, PARSE_RELAXED);
-+ } catch (GLib.UriError err) {
-+ debug("Invalid link URI: %s", err.message);
-+ }
- if (url != null) {
- is_valid = true;
-
-diff --git a/src/client/conversation-viewer/conversation-message.vala b/src/client/conversation-viewer/conversation-message.vala
-index c15f3f8fc..d7492b9f8 100644
---- a/src/client/conversation-viewer/conversation-message.vala
-+++ b/src/client/conversation-viewer/conversation-message.vala
-@@ -1335,16 +1335,16 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
- string href,
- Gdk.Rectangle location) {
- string text_href = text;
-- if (Uri.parse_scheme(text_href) == null) {
-+ if (GLib.Uri.parse_scheme(text_href) == null) {
- text_href = "http://" + text_href;
- }
-- string text_label = Soup.URI.decode(text_href);
-+ string? text_label = GLib.Uri.unescape_string(text_href) ?? _("(unknown)");
-
- string anchor_href = href;
-- if (Uri.parse_scheme(anchor_href) == null) {
-+ if (GLib.Uri.parse_scheme(anchor_href) == null) {
- anchor_href = "http://" + anchor_href;
- }
-- string anchor_label = Soup.URI.decode(anchor_href);
-+ string anchor_label = GLib.Uri.unescape_string(anchor_href) ?? _("(unknown)");
-
- Gtk.Builder builder = new Gtk.Builder.from_resource(
- "/org/gnome/Geary/conversation-message-link-popover.ui"
-diff --git a/src/client/meson.build b/src/client/meson.build
-index ff3c8a6d3..ba151e420 100644
---- a/src/client/meson.build
-+++ b/src/client/meson.build
-@@ -168,7 +168,6 @@ client_dependencies = [
- libpeas,
- libpeas_gtk,
- libsecret,
-- libsoup,
- libxml,
- posix,
- webkit2gtk,
-diff --git a/src/client/plugin/meson.build b/src/client/plugin/meson.build
-index e6db08535..b795237e8 100644
---- a/src/client/plugin/meson.build
-+++ b/src/client/plugin/meson.build
-@@ -16,7 +16,6 @@ plugin_dependencies = [
- libhandy,
- libmath,
- libpeas,
-- libsoup,
- webkit2gtk,
- ]
-
-diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala
-index c36c4e28d..dc686350a 100644
---- a/src/client/web-process/web-process-extension.vala
-+++ b/src/client/web-process/web-process-extension.vala
-@@ -68,7 +68,12 @@ public class GearyWebExtension : Object {
- WebKit.URIRequest request,
- WebKit.URIResponse? response) {
- bool should_load = false;
-- Soup.URI? uri = new Soup.URI(request.get_uri());
-+ GLib.Uri? uri = null;
-+ try {
-+ uri = GLib.Uri.parse(request.get_uri(), NONE);
-+ } catch (GLib.UriError err) {
-+ warning("Invalid request URI: %s", err.message);
-+ }
- if (uri != null && uri.get_scheme() in ALLOWED_SCHEMES) {
- // Always load internal resources
- should_load = true;
-diff --git a/src/meson.build b/src/meson.build
-index 5eded12e6..4e7752ab9 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -107,7 +107,6 @@ bin_dependencies = [
- libhandy,
- libmath,
- libpeas,
-- libsoup,
- webkit2gtk,
- ]
-
---
-GitLab
-
diff --git a/796845aa.patch b/796845aa.patch
deleted file mode 100644
index 2704525..0000000
--- a/796845aa.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 796845aaa7148076132af0ff074e9218d0c3f8b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Bellegarde?= <cedric.bellegarde(a)adishatz.org>
-Date: Wed, 13 Jul 2022 20:10:02 +0200
-Subject: [PATCH] build: Fix building against libsoup3
-
-- Move to WebKitGTK 4.1
-- Remove commit hold on EDS
----
- meson.build | 6 +++---
- org.gnome.Geary.json | 4 +---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 92b987925..27043e575 100644
---- a/meson.build
-+++ b/meson.build
-@@ -67,7 +67,7 @@ glib = dependency('glib-2.0', version: '>=' + target_glib)
- gmime = dependency('gmime-3.0', version: '>= 3.2.4')
- gtk = dependency('gtk+-3.0', version: '>=' + target_gtk)
- sqlite = dependency('sqlite3', version: '>= 3.24')
--webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
-+webkit2gtk = dependency('webkit2gtk-4.1', version: '>=' + target_webkit)
-
- # Secondary deps - keep sorted alphabetically
- # We need appdata.its from appstream-glib:
-@@ -87,7 +87,7 @@ gspell = dependency('gspell-1')
- gthread = dependency('gthread-2.0', version: '>=' + target_glib)
- icu_uc = dependency('icu-uc', version: '>=60')
- iso_codes = dependency('iso-codes')
--javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
-+javascriptcoregtk = dependency('javascriptcoregtk-4.1', version: '>=' + target_webkit)
- json_glib = dependency('json-glib-1.0', version: '>= 1.0')
- libhandy = dependency('libhandy-1', version: '>= 1.2.1', required: false)
- libmath = cc.find_library('m')
-@@ -103,7 +103,7 @@ libunwind_generic_dep = dependency(
- libxml = dependency('libxml-2.0', version: '>= 2.7.8')
- libytnef = dependency('libytnef', version: '>= 1.9.3', required: get_option('tnef'))
- posix = valac.find_library('posix')
--webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
-+webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.1', version: '>=' + target_webkit)
-
- # System dependencies above ensures appropriate versions for the
- # following libraries, but the declared dependency is what we actually
---
-GitLab
-
diff --git a/9bd4c829.patch b/9bd4c829.patch
deleted file mode 100644
index 2d071a1..0000000
--- a/9bd4c829.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Tue, 30 Nov 2021 15:31:31 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/client/application/application-client.vala | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
-index 6ce19ce2a..e6ba85331 100644
---- a/src/client/application/application-client.vala
-+++ b/src/client/application/application-client.vala
-@@ -8,16 +8,16 @@
-
- // Defined by CMake build script.
- extern const string GETTEXT_PACKAGE;
--extern const string _APP_ID;
--extern const string _BUILD_ROOT_DIR;
--extern const string _GSETTINGS_DIR;
--extern const string _INSTALL_PREFIX;
--extern const string _NAME_SUFFIX;
-+public extern const string _APP_ID;
-+public extern const string _BUILD_ROOT_DIR;
-+public extern const string _GSETTINGS_DIR;
-+public extern const string _INSTALL_PREFIX;
-+public extern const string _NAME_SUFFIX;
- extern const string _PLUGINS_DIR;
- extern const string _PROFILE;
- extern const string _REVNO;
--extern const string _SOURCE_ROOT_DIR;
--extern const string _VERSION;
-+public extern const string _SOURCE_ROOT_DIR;
-+public extern const string _VERSION;
- extern const string _WEB_EXTENSIONS_DIR;
-
-
---
-GitLab
-
diff --git a/geary.spec b/geary.spec
index 68bc065..978c1f5 100644
--- a/geary.spec
+++ b/geary.spec
@@ -1,8 +1,8 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: geary
-Version: 40.0
-Release: 9%{?dist}
+Version: 43.0
+Release: 1%{?dist}
Summary: A lightweight email program designed around conversations
# Geary is under LGPLv2+.
# SQLite3-unicodesn code is in the Public Domain.
@@ -15,14 +15,7 @@ Summary: A lightweight email program designed around conversations
# the whole binary, so we don't need to specify BSD and MIT separately.
License: LGPLv2+ and CC-BY and CC-BY-SA and Public Domain
URL: https://wiki.gnome.org/Apps/Geary
-Source0: https://download.gnome.org/sources/geary/40/%{name}-%{tarball_version}.ta...
-# Fix accessibility issues with initializer of constants
-Patch0: 9bd4c829.patch
-# Workaround missing generic type argument
-Patch1: 0f75e7a8.patch
-# Build against libsoup 3
-Patch2: 1c1912d0.patch
-Patch3: 796845aa.patch
+Source0: https://download.gnome.org/sources/geary/43/%{name}-%{tarball_version}.ta...
BuildRequires: meson >= 0.49
BuildRequires: vala >= 0.26.0
@@ -50,7 +43,7 @@ BuildRequires: pkgconfig(gspell-1)
BuildRequires: pkgconfig(gthread-2.0) >= 2.54
BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(iso-codes)
-BuildRequires: pkgconfig(javascriptcoregtk-4.0) >= 2.24
+BuildRequires: pkgconfig(javascriptcoregtk-4.1)
BuildRequires: pkgconfig(json-glib-1.0) >= 1.0
BuildRequires: pkgconfig(libhandy-1) >= 1.2.1
BuildRequires: pkgconfig(libpeas-1.0)
@@ -60,7 +53,7 @@ BuildRequires: pkgconfig(libunwind) >= 1.1
BuildRequires: pkgconfig(libunwind-generic) >= 1.1
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8
BuildRequires: pkgconfig(libytnef) >= 1.9.3
-BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= 2.24
+BuildRequires: pkgconfig(webkit2gtk-web-extension-4.1)
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -119,6 +112,9 @@ popd
%changelog
+* Fri Sep 30 2022 Kalev Lember <klember(a)redhat.com> - 43.0-1
+- Update to 43.0
+
* Thu Aug 18 2022 Kalev Lember <klember(a)redhat.com> - 40.0-9
- Build against libsoup 3 (rhbz#2119119)
diff --git a/sources b/sources
index 400f344..ef17326 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (geary-40.0.tar.xz) = d31716121be63a9d39caf4bffacce0109cebcc8048127c37fac6969b4103ab2cf12aac9bed73623b0f3baf7f39996b8f0b0fe9b57968054d51ae3e209f6b1522
+SHA512 (geary-43.0.tar.xz) = 71bf774aa27d4edef61932197bbf9b58b67ace8dd7969c4669fcd45e33c05a08d3d6eae280ea6a7e9f58db626f541f15b0f0d33f3162bef5fd21a368122dbba0
https://src.fedoraproject.org/rpms/geary/c/e07930fffbd0cd4d124c1edf5ab69f...
1Â year, 6Â months
kalev pushed to geary (rawhide). "Update to 43.0"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:14:34 UTC
From e07930fffbd0cd4d124c1edf5ab69f2585cf9166 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember(a)redhat.com>
Date: Sep 30 2022 21:13:56 +0000
Subject: Update to 43.0
---
diff --git a/0f75e7a8.patch b/0f75e7a8.patch
deleted file mode 100644
index 390cc5b..0000000
--- a/0f75e7a8.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 0f75e7a84a39492d0748cec2ba6028e08cae3644
-Author: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Sun Jan 30 19:54:11 2022
-
- Util.Cache.Lru: Workaround missing generic type argument
-
-diff --git a/src/client/util/util-cache.vala b/src/client/util/util-cache.vala
-index f054e32e5..ecc275e84 100644
---- a/src/client/util/util-cache.vala
-+++ b/src/client/util/util-cache.vala
-@@ -12,7 +12,7 @@ public class Util.Cache.Lru<T> : Geary.BaseObject {
- private class CacheEntry<T> {
-
-
-- public static int lru_compare(CacheEntry<T> a, CacheEntry<T> b) {
-+ public static int lru_compare(CacheEntry a, CacheEntry b) {
- if (a.key == b.key) {
- return 0;
- }
diff --git a/1c1912d0.patch b/1c1912d0.patch
deleted file mode 100644
index a7310d2..0000000
--- a/1c1912d0.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 1c1912d0061bb59525b870767d08b16c09acc8da Mon Sep 17 00:00:00 2001
-From: Michael Gratton <mike(a)vee.net>
-Date: Sat, 15 May 2021 22:14:49 +1000
-Subject: [PATCH] build: Remove explicit libsoup dependency
-
-Replace all uses of libsoup with their GLib equivalents, and remove the
-build dependency.
-
-See GNOME/gnome-build-meta#378
----
- meson.build | 1 -
- src/client/components/components-web-view.vala | 5 +----
- src/client/composer/composer-link-popover.vala | 10 +++++++---
- .../conversation-viewer/conversation-message.vala | 8 ++++----
- src/client/meson.build | 1 -
- src/client/plugin/meson.build | 1 -
- src/client/web-process/web-process-extension.vala | 7 ++++++-
- src/meson.build | 1 -
- 8 files changed, 18 insertions(+), 16 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index d0af9eef8..233e8c56b 100644
---- a/meson.build
-+++ b/meson.build
-@@ -95,7 +95,6 @@ libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
- libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
- libsecret = dependency('libsecret-1', version: '>= 0.11')
- libstemmer_dep = cc.find_library('stemmer')
--libsoup = dependency('libsoup-2.4', version: '>= 2.48')
- libunwind_dep = dependency(
- 'libunwind', version: '>= 1.1', required: get_option('libunwind')
- )
-diff --git a/src/client/components/components-web-view.vala b/src/client/components/components-web-view.vala
-index fe3c036d2..4ec857f92 100644
---- a/src/client/components/components-web-view.vala
-+++ b/src/client/components/components-web-view.vala
-@@ -696,7 +696,7 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
- }
-
- private bool handle_internal_response(WebKit.URISchemeRequest request) {
-- string name = soup_uri_decode(request.get_path());
-+ string name = GLib.Uri.unescape_string(request.get_path());
- Geary.Memory.Buffer? buf = this.internal_resources[name];
- bool handled = false;
- if (buf != null) {
-@@ -853,6 +853,3 @@ public abstract class Components.WebView : WebKit.WebView, Geary.BaseInterface {
- }
-
- }
--
--// XXX this needs to be moved into the libsoup bindings
--extern string soup_uri_decode(string part);
-diff --git a/src/client/composer/composer-link-popover.vala b/src/client/composer/composer-link-popover.vala
-index 63ec71ee5..c4bc3d963 100644
---- a/src/client/composer/composer-link-popover.vala
-+++ b/src/client/composer/composer-link-popover.vala
-@@ -52,7 +52,7 @@ public class Composer.LinkPopover : Gtk.Popover {
-
-
- /** Emitted when the link URL has changed. */
-- public signal void link_changed(Soup.URI? uri, bool is_valid);
-+ public signal void link_changed(GLib.Uri? uri, bool is_valid);
-
- /** Emitted when the link URL was activated. */
- public signal void link_activate();
-@@ -99,9 +99,13 @@ public class Composer.LinkPopover : Gtk.Popover {
- bool is_valid = false;
- bool is_nominal = false;
- bool is_mailto = false;
-- Soup.URI? url = null;
-+ GLib.Uri? url = null;
- if (!is_empty) {
-- url = new Soup.URI(text);
-+ try {
-+ url = GLib.Uri.parse(text, PARSE_RELAXED);
-+ } catch (GLib.UriError err) {
-+ debug("Invalid link URI: %s", err.message);
-+ }
- if (url != null) {
- is_valid = true;
-
-diff --git a/src/client/conversation-viewer/conversation-message.vala b/src/client/conversation-viewer/conversation-message.vala
-index c15f3f8fc..d7492b9f8 100644
---- a/src/client/conversation-viewer/conversation-message.vala
-+++ b/src/client/conversation-viewer/conversation-message.vala
-@@ -1335,16 +1335,16 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
- string href,
- Gdk.Rectangle location) {
- string text_href = text;
-- if (Uri.parse_scheme(text_href) == null) {
-+ if (GLib.Uri.parse_scheme(text_href) == null) {
- text_href = "http://" + text_href;
- }
-- string text_label = Soup.URI.decode(text_href);
-+ string? text_label = GLib.Uri.unescape_string(text_href) ?? _("(unknown)");
-
- string anchor_href = href;
-- if (Uri.parse_scheme(anchor_href) == null) {
-+ if (GLib.Uri.parse_scheme(anchor_href) == null) {
- anchor_href = "http://" + anchor_href;
- }
-- string anchor_label = Soup.URI.decode(anchor_href);
-+ string anchor_label = GLib.Uri.unescape_string(anchor_href) ?? _("(unknown)");
-
- Gtk.Builder builder = new Gtk.Builder.from_resource(
- "/org/gnome/Geary/conversation-message-link-popover.ui"
-diff --git a/src/client/meson.build b/src/client/meson.build
-index ff3c8a6d3..ba151e420 100644
---- a/src/client/meson.build
-+++ b/src/client/meson.build
-@@ -168,7 +168,6 @@ client_dependencies = [
- libpeas,
- libpeas_gtk,
- libsecret,
-- libsoup,
- libxml,
- posix,
- webkit2gtk,
-diff --git a/src/client/plugin/meson.build b/src/client/plugin/meson.build
-index e6db08535..b795237e8 100644
---- a/src/client/plugin/meson.build
-+++ b/src/client/plugin/meson.build
-@@ -16,7 +16,6 @@ plugin_dependencies = [
- libhandy,
- libmath,
- libpeas,
-- libsoup,
- webkit2gtk,
- ]
-
-diff --git a/src/client/web-process/web-process-extension.vala b/src/client/web-process/web-process-extension.vala
-index c36c4e28d..dc686350a 100644
---- a/src/client/web-process/web-process-extension.vala
-+++ b/src/client/web-process/web-process-extension.vala
-@@ -68,7 +68,12 @@ public class GearyWebExtension : Object {
- WebKit.URIRequest request,
- WebKit.URIResponse? response) {
- bool should_load = false;
-- Soup.URI? uri = new Soup.URI(request.get_uri());
-+ GLib.Uri? uri = null;
-+ try {
-+ uri = GLib.Uri.parse(request.get_uri(), NONE);
-+ } catch (GLib.UriError err) {
-+ warning("Invalid request URI: %s", err.message);
-+ }
- if (uri != null && uri.get_scheme() in ALLOWED_SCHEMES) {
- // Always load internal resources
- should_load = true;
-diff --git a/src/meson.build b/src/meson.build
-index 5eded12e6..4e7752ab9 100644
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -107,7 +107,6 @@ bin_dependencies = [
- libhandy,
- libmath,
- libpeas,
-- libsoup,
- webkit2gtk,
- ]
-
---
-GitLab
-
diff --git a/796845aa.patch b/796845aa.patch
deleted file mode 100644
index 2704525..0000000
--- a/796845aa.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 796845aaa7148076132af0ff074e9218d0c3f8b8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?C=C3=A9dric=20Bellegarde?= <cedric.bellegarde(a)adishatz.org>
-Date: Wed, 13 Jul 2022 20:10:02 +0200
-Subject: [PATCH] build: Fix building against libsoup3
-
-- Move to WebKitGTK 4.1
-- Remove commit hold on EDS
----
- meson.build | 6 +++---
- org.gnome.Geary.json | 4 +---
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 92b987925..27043e575 100644
---- a/meson.build
-+++ b/meson.build
-@@ -67,7 +67,7 @@ glib = dependency('glib-2.0', version: '>=' + target_glib)
- gmime = dependency('gmime-3.0', version: '>= 3.2.4')
- gtk = dependency('gtk+-3.0', version: '>=' + target_gtk)
- sqlite = dependency('sqlite3', version: '>= 3.24')
--webkit2gtk = dependency('webkit2gtk-4.0', version: '>=' + target_webkit)
-+webkit2gtk = dependency('webkit2gtk-4.1', version: '>=' + target_webkit)
-
- # Secondary deps - keep sorted alphabetically
- # We need appdata.its from appstream-glib:
-@@ -87,7 +87,7 @@ gspell = dependency('gspell-1')
- gthread = dependency('gthread-2.0', version: '>=' + target_glib)
- icu_uc = dependency('icu-uc', version: '>=60')
- iso_codes = dependency('iso-codes')
--javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
-+javascriptcoregtk = dependency('javascriptcoregtk-4.1', version: '>=' + target_webkit)
- json_glib = dependency('json-glib-1.0', version: '>= 1.0')
- libhandy = dependency('libhandy-1', version: '>= 1.2.1', required: false)
- libmath = cc.find_library('m')
-@@ -103,7 +103,7 @@ libunwind_generic_dep = dependency(
- libxml = dependency('libxml-2.0', version: '>= 2.7.8')
- libytnef = dependency('libytnef', version: '>= 1.9.3', required: get_option('tnef'))
- posix = valac.find_library('posix')
--webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit)
-+webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.1', version: '>=' + target_webkit)
-
- # System dependencies above ensures appropriate versions for the
- # following libraries, but the declared dependency is what we actually
---
-GitLab
-
diff --git a/9bd4c829.patch b/9bd4c829.patch
deleted file mode 100644
index 2d071a1..0000000
--- a/9bd4c829.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9bd4c82952a0a2c3308c5cc86c0b85650c1fb484 Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Tue, 30 Nov 2021 15:31:31 +0100
-Subject: [PATCH] Fix accessibility issues with initializer of constants
-
----
- src/client/application/application-client.vala | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala
-index 6ce19ce2a..e6ba85331 100644
---- a/src/client/application/application-client.vala
-+++ b/src/client/application/application-client.vala
-@@ -8,16 +8,16 @@
-
- // Defined by CMake build script.
- extern const string GETTEXT_PACKAGE;
--extern const string _APP_ID;
--extern const string _BUILD_ROOT_DIR;
--extern const string _GSETTINGS_DIR;
--extern const string _INSTALL_PREFIX;
--extern const string _NAME_SUFFIX;
-+public extern const string _APP_ID;
-+public extern const string _BUILD_ROOT_DIR;
-+public extern const string _GSETTINGS_DIR;
-+public extern const string _INSTALL_PREFIX;
-+public extern const string _NAME_SUFFIX;
- extern const string _PLUGINS_DIR;
- extern const string _PROFILE;
- extern const string _REVNO;
--extern const string _SOURCE_ROOT_DIR;
--extern const string _VERSION;
-+public extern const string _SOURCE_ROOT_DIR;
-+public extern const string _VERSION;
- extern const string _WEB_EXTENSIONS_DIR;
-
-
---
-GitLab
-
diff --git a/geary.spec b/geary.spec
index 68bc065..978c1f5 100644
--- a/geary.spec
+++ b/geary.spec
@@ -1,8 +1,8 @@
%global tarball_version %%(echo %{version} | tr '~' '.')
Name: geary
-Version: 40.0
-Release: 9%{?dist}
+Version: 43.0
+Release: 1%{?dist}
Summary: A lightweight email program designed around conversations
# Geary is under LGPLv2+.
# SQLite3-unicodesn code is in the Public Domain.
@@ -15,14 +15,7 @@ Summary: A lightweight email program designed around conversations
# the whole binary, so we don't need to specify BSD and MIT separately.
License: LGPLv2+ and CC-BY and CC-BY-SA and Public Domain
URL: https://wiki.gnome.org/Apps/Geary
-Source0: https://download.gnome.org/sources/geary/40/%{name}-%{tarball_version}.ta...
-# Fix accessibility issues with initializer of constants
-Patch0: 9bd4c829.patch
-# Workaround missing generic type argument
-Patch1: 0f75e7a8.patch
-# Build against libsoup 3
-Patch2: 1c1912d0.patch
-Patch3: 796845aa.patch
+Source0: https://download.gnome.org/sources/geary/43/%{name}-%{tarball_version}.ta...
BuildRequires: meson >= 0.49
BuildRequires: vala >= 0.26.0
@@ -50,7 +43,7 @@ BuildRequires: pkgconfig(gspell-1)
BuildRequires: pkgconfig(gthread-2.0) >= 2.54
BuildRequires: pkgconfig(icu-uc)
BuildRequires: pkgconfig(iso-codes)
-BuildRequires: pkgconfig(javascriptcoregtk-4.0) >= 2.24
+BuildRequires: pkgconfig(javascriptcoregtk-4.1)
BuildRequires: pkgconfig(json-glib-1.0) >= 1.0
BuildRequires: pkgconfig(libhandy-1) >= 1.2.1
BuildRequires: pkgconfig(libpeas-1.0)
@@ -60,7 +53,7 @@ BuildRequires: pkgconfig(libunwind) >= 1.1
BuildRequires: pkgconfig(libunwind-generic) >= 1.1
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.8
BuildRequires: pkgconfig(libytnef) >= 1.9.3
-BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= 2.24
+BuildRequires: pkgconfig(webkit2gtk-web-extension-4.1)
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -119,6 +112,9 @@ popd
%changelog
+* Fri Sep 30 2022 Kalev Lember <klember(a)redhat.com> - 43.0-1
+- Update to 43.0
+
* Thu Aug 18 2022 Kalev Lember <klember(a)redhat.com> - 40.0-9
- Build against libsoup 3 (rhbz#2119119)
diff --git a/sources b/sources
index 400f344..ef17326 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (geary-40.0.tar.xz) = d31716121be63a9d39caf4bffacce0109cebcc8048127c37fac6969b4103ab2cf12aac9bed73623b0f3baf7f39996b8f0b0fe9b57968054d51ae3e209f6b1522
+SHA512 (geary-43.0.tar.xz) = 71bf774aa27d4edef61932197bbf9b58b67ace8dd7969c4669fcd45e33c05a08d3d6eae280ea6a7e9f58db626f541f15b0f0d33f3162bef5fd21a368122dbba0
https://src.fedoraproject.org/rpms/geary/c/e07930fffbd0cd4d124c1edf5ab69f...
1Â year, 6Â months
gotmax23 pushed to ansible-packaging (f35). "Merge branch 'rawhide'
into f35"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:11:11 UTC
From cddc3f949f64b393dacea13f3c8e01de621ee773 Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax(a)e.email>
Date: Sep 30 2022 20:56:07 +0000
Subject: Merge branch 'rawhide' into f35
---
diff --git a/ansible-packaging.spec b/ansible-packaging.spec
index d769013..0cd3c26 100644
--- a/ansible-packaging.spec
+++ b/ansible-packaging.spec
@@ -1,6 +1,6 @@
Name: ansible-packaging
Version: 1
-Release: 8%{?dist}
+Release: 8.1%{?dist}
Summary: RPM packaging macros and generators for Ansible collections
License: GPL-3.0-or-later
@@ -9,7 +9,12 @@ Source0: ansible-generator
Source1: ansible.attr
Source2: macros.ansible
Source3: macros.ansible-srpm
-Source4: COPYING
+Source4: ansible_collection.py
+
+Source100: COPYING
+
+# Needed for ansible_collection.py
+Requires: %{py3_dist pyyaml}
# Require ansible-core for building. Collections still have a boolean runtime
# dependency on either ansible 2.9 OR ansible-core.
@@ -67,9 +72,61 @@ cp -a %{sources} .
%install
install -Dpm0644 -t %{buildroot}%{_fileattrsdir} ansible.attr
-install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible
-install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible-srpm
+install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible
+install -Dpm0644 -t %{buildroot}%{_rpmmacrodir} macros.ansible-srpm
install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
+install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible_collection.py
+
+%check
+# TODO: Currently, this only tests %%{ansible_collection_url}.
+
+rpm_eval() {
+ default_macros_path="$(rpm --showrc | grep 'Macro path' | awk -F ': ' '{print $2}')"
+ rpm --macros="${default_macros_path}:%{buildroot}%{_rpmmacrodir}/macros.*" "$@"
+}
+
+errors() {
+ error="error: %%ansible_collection_url: You must pass the collection namespace as the first arg and the collection name as the second"
+ "$@" && exit 1
+ "$@" |& grep -q "${error}"
+}
+
+echo "Ensure macro fails when only collection_namespace macro is defined"
+errors rpm_eval -D 'collection_namespace cc' -E '%%ansible_collection_url'
+
+echo
+echo "Ensure macro fails when only collection_name macro is defined"
+errors rpm_eval -D 'collection_name cc' -E '%%ansible_collection_url'
+
+echo
+echo "Ensure macro fails when second argument is missing"
+errors rpm_eval -E '%%ansible_collection_url a'
+
+echo
+echo "Ensure macro fails when second argument is missing"
+errors rpm_eval -D 'collection_name b' -E '%%ansible_collection_url a'
+
+echo
+echo "Ensure macro fails when neither the control macros nor macro arguments are passed"
+errors rpm_eval -E '%%ansible_collection_url'
+
+
+echo
+echo
+echo "Ensure macro works when both arguments are passed and no control macros are set"
+[[ $(rpm_eval -E '%%ansible_collection_url community general') == \
+ "https://galaxy.ansible.com/community/general" ]]
+
+echo
+echo "Ensure macro works with the control macros"
+[[ $(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \
+ -E '%%ansible_collection_url') == "https://galaxy.ansible.com/ansible/posix" ]]
+
+echo
+echo "Ensure macro prefers the collection namespace and name passed as an argument over the control macros"
+[[ $(rpm_eval -D 'collection_namespace ansible' -D 'collection_name posix' \
+ -E '%%ansible_collection_url community general') == "https://galaxy.ansible.com/community/general" ]]
+
%files
@@ -77,6 +134,7 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
%{_fileattrsdir}/ansible.attr
%{_rpmmacrodir}/macros.ansible
%{_rpmconfigdir}/ansible-generator
+%{_rpmconfigdir}/ansible_collection.py
%files -n ansible-srpm-macros
@@ -91,6 +149,17 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} ansible-generator
%changelog
+* Sat Sep 24 2022 Maxwell G <gotmax(a)e.email> - 1-8.1
+- Refactor %%ansible_collection_url, %%ansible_collection_install,
+ %%ansible_test_unit.
+- Specfiles no longer need to define %%collection_namespace or %%collection_name
+ for the macros to work.
+- Add new %%ansible_collections_dir, %%ansible_roles_dir, and
+ %%ansible_collection_filelist macros.
+- Prepare to deprecate %%ansible_collection_files
+- Undefine %%_package_note_file to stop that file from leaking into collection
+ artifacts.
+
* Sat Aug 27 2022 Maxwell G <gotmax(a)e.email> - 1-8
- Allow both ansible-core and ansible at buildtime again
- Fixes: rhbz#2121892.
diff --git a/ansible_collection.py b/ansible_collection.py
new file mode 100755
index 0000000..70093be
--- /dev/null
+++ b/ansible_collection.py
@@ -0,0 +1,153 @@
+#!/usr/bin/python3
+# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-FileCopyrightText 2022 Maxwell G <gotmax(a)e.email>
+
+"""
+This script uses Ansible Collection metadata from galaxy.yml to figure out the
+namespace, name, and version of the collection being packaged.
+
+``ansible_collection.py install`` (used by %ansible_collecton_install) uses
+this information to find and install the collection artifact that was just
+built with %ansible_collection_build. It also generates a files list for use
+with `%files -f`.
+
+``ansible_collection.py test`` (used by %ansible_test_unit) parses galaxy.yml
+to determine the collection namespace and name that's needed to create the
+directory structure that ansible-test expects. After creating a temporary build
+directory with the needed structure, the script runs ansible-test units with
+the provided arguments.
+"""
+
+import argparse
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+from tempfile import TemporaryDirectory
+from typing import Any, Dict, Optional, Sequence, Union
+
+from yaml import CSafeLoader, load
+
+
+class CollectionError(Exception):
+ pass
+
+
+class AnsibleCollection:
+ def __init__(self, collection_srcdir: Optional[Path] = None) -> None:
+ self.collection_srcdir = collection_srcdir or Path.cwd()
+ self.data = self._load_data()
+ self.namespace = self.data["namespace"]
+ self.name = self.data["name"]
+ self.version = self.data["version"]
+
+ def _load_data(self) -> Dict[str, Any]:
+ path = self.collection_srcdir / "galaxy.yml"
+ if not path.exists():
+ raise CollectionError(f"{path} does not exist!")
+ print(f"Loading collection metadata from {path}")
+
+ with open(path, encoding="utf-8") as file:
+ return load(file, Loader=CSafeLoader)
+
+ def install(self, destdir: Union[str, Path]) -> None:
+ artifact = self.collection_srcdir / Path(
+ f"{self.namespace}-{self.name}-{self.version}.tar.gz"
+ )
+ if not artifact.exists() and not artifact.is_file():
+ raise CollectionError(
+ f"{artifact} does not exist! Did you run %ansible_collection_build?"
+ )
+
+ args = (
+ "ansible-galaxy",
+ "collection",
+ "install",
+ "-n",
+ "-p",
+ str(destdir),
+ str(artifact),
+ )
+ print(f"Running: {args}")
+ print()
+ # Without this, the print statements are shown after the command
+ # output when building in mock.
+ sys.stdout.flush()
+ subprocess.run(args, check=True, cwd=self.collection_srcdir)
+ print()
+
+ def write_filelist(self, filelist: Path) -> None:
+ filelist.parent.mkdir(parents=True, exist_ok=True)
+ contents = "%{ansible_collections_dir}/" + self.namespace
+ print(f"Writing filelist to {filelist}")
+ with open(filelist, "w", encoding="utf-8") as file:
+ file.write(contents)
+
+ def unit_test(self, extra_args: Sequence) -> None:
+ with TemporaryDirectory() as temp:
+ temppath = Path(temp) / "ansible_collections" / self.namespace / self.name
+ shutil.copytree(
+ self.collection_srcdir,
+ temppath,
+ )
+ args = ("ansible-test", "units", *extra_args)
+ print(f"Running: {args}")
+ print()
+ # Without this, the print statements are shown after the command
+ # output when building in mock.
+ sys.stdout.flush()
+ subprocess.run(args, cwd=temppath, check=True)
+
+
+def parseargs() -> argparse.Namespace:
+ parser = argparse.ArgumentParser(
+ "Install and test Ansible Collections in an rpmbuild environment"
+ )
+ subparsers = parser.add_subparsers(dest="action")
+ install_parser = subparsers.add_parser(
+ "install",
+ help="Run ansible-galaxy collection install and write filelist",
+ )
+ install_parser.add_argument(
+ "--collections-dir",
+ required=True,
+ help="Collection destination directory",
+ type=Path,
+ )
+ install_parser.add_argument(
+ "--filelist",
+ type=Path,
+ required=True,
+ help="%%{ansible_collection_filelist}",
+ )
+
+ test_parser = subparsers.add_parser(
+ "test",
+ help="Run ansible-test unit after creating the necessary directory structure",
+ )
+ test_parser.add_argument(
+ "extra_args", nargs="*", help="Extra arguments to pass to ansible-test"
+ )
+ args = parser.parse_args()
+ # add_subparsers does not support required on Python 3.6
+ if not args.action:
+ parser.print_usage()
+ sys.exit(2)
+ return args
+
+
+def main():
+ args = parseargs()
+ collection = AnsibleCollection()
+ if args.action == "install":
+ collection.install(args.collections_dir)
+ collection.write_filelist(args.filelist)
+ elif args.action == "test":
+ collection.unit_test(args.extra_args)
+
+
+if __name__ == "__main__":
+ try:
+ main()
+ except (CollectionError, subprocess.CalledProcessError) as err:
+ sys.exit(err)
diff --git a/macros.ansible b/macros.ansible
index abab21d..db2269a 100644
--- a/macros.ansible
+++ b/macros.ansible
@@ -1,12 +1,31 @@
+# Stores ephemeral data that's created by %%ansible_collection_install
+# and used by other macros.
+%__ansible_builddir %{_builddir}/%{?buildsubdir:%{buildsubdir}/}.ansible-packaging
+
+%ansible_roles_dir %{_datadir}/ansible/roles
+%ansible_collections_dir %{_datadir}/ansible/collections/ansible_collections
+
%ansible_collection_build() ansible-galaxy collection build
-%ansible_collection_install() ansible-galaxy collection install -n -p %{buildroot}%{_datadir}/ansible/collections %{collection_namespace}-%{collection_name}-%{version}.tar.gz
+# On F36, package-notes-srpm-macros inserts a package note file into
+# %%{buildsubdir} that ends up getting included in the collection builds.
+%ansible_collection_install() %{shrink:
+%undefine _package_note_file
+%{_rpmconfigdir}/ansible_collection.py install
+--collections-dir %{buildroot}%{ansible_collections_dir}
+--filelist %{ansible_collection_filelist}
+}
+
+%ansible_test_unit() %{shrink:
+%{_rpmconfigdir}/ansible_collection.py test --
+--python-interpreter %{__python3} --local %{?*}
+}
-%ansible_test_unit() %{expand:\\\
-mkdir -p ../ansible_collections/%{collection_namespace}
-cp -a $(pwd) ../ansible_collections/%{collection_namespace}/%{collection_name}
-pushd ../ansible_collections/%{collection_namespace}/%{collection_name}
-ansible-test units --python-interpreter %{__python3} --local %{?*}
-popd}
+# TODO: Officially deprecate this macro and add the following line to the macro
+# def after the new approach has gotten more testing and adoption:
+# %%{warn: %%{ansible_collection_files} is deprecated. Use %%files -f %%{ansible_collection_filelist} instead.}
+%ansible_collection_files %{shrink:
+%{ansible_collections_dir}/%{collection_namespace}/
+}
-%ansible_collection_files %{_datadir}/ansible/collections/ansible_collections/%{collection_namespace}/
+%ansible_collection_filelist %{__ansible_builddir}/ansible_collection_files
diff --git a/macros.ansible-srpm b/macros.ansible-srpm
index 9b208b4..0adacd7 100644
--- a/macros.ansible-srpm
+++ b/macros.ansible-srpm
@@ -1 +1,25 @@
-%ansible_collection_url() https://galaxy.ansible.com/%{collection_namespace}/%{collection_name}
+# Note(gotmax23): I'm trying to get rid of the need for control macros in favor
+# of a metadata based approach. %%ansible_collection_url is the only macro that
+# requires manually specifying the collection namespace and name, as it is used
+# at the SRPM build stage.
+#
+# Currently, this macro supports either passing this information as arguments
+# or defining the control macros. In order to reduce confusion, this is not an
+# either or approach. Both arguments must be passed OR both control macros must
+# be defined.
+
+%ansible_collection_url() %{lua:
+ local namespace_name = nil
+ if rpm.expand("%collection_namespace") ~= "%collection_namespace"
+ and rpm.expand("%collection_name") ~= "%collection_name" then
+ namespace_name = rpm.expand("%collection_namespace") .. "/" .. rpm.expand("%collection_name")
+ end
+ if rpm.expand("%1") ~= "%1" and rpm.expand("%2") ~= "%2" then
+ namespace_name = rpm.expand("%1") .. "/" .. rpm.expand("%2")
+ end
+ if not namespace_name then
+ rpm.expand("%{error:%%ansible_collection_url: You must pass the collection " ..
+ "namespace as the first arg and the collection name as the second}")
+ end
+ print("https://galaxy.ansible.com/" .. namespace_name)
+}
https://src.fedoraproject.org/rpms/ansible-packaging/c/cddc3f949f64b393da...
1Â year, 6Â months
gotmax23 pushed to ansible-packaging (f35). "Update changelog"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:11:11 UTC
From ac5ea247600fc1701b2173754070ed2b02826f13 Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax(a)e.email>
Date: Sep 30 2022 20:56:57 +0000
Subject: Update changelog
---
diff --git a/ansible-packaging.spec b/ansible-packaging.spec
index 0cd3c26..9a9e255 100644
--- a/ansible-packaging.spec
+++ b/ansible-packaging.spec
@@ -159,6 +159,9 @@ echo "Ensure macro prefers the collection namespace and name passed as an argume
- Prepare to deprecate %%ansible_collection_files
- Undefine %%_package_note_file to stop that file from leaking into collection
artifacts.
+- Require ansible-core at buildtime now that the source of the conflict
+ has been addressed.
+ Relates: 2121892
* Sat Aug 27 2022 Maxwell G <gotmax(a)e.email> - 1-8
- Allow both ansible-core and ansible at buildtime again
https://src.fedoraproject.org/rpms/ansible-packaging/c/ac5ea247600fc1701b...
1Â year, 6Â months
gotmax23 pushed to ansible-packaging (f35). "Only build against
ansible-core (..more)"
by notificationsï¼ fedoraproject.org
Notification time stamped 2022-09-30 21:11:11 UTC
From f9f014a54d4f818097949a9e41bf0a7a80b61062 Mon Sep 17 00:00:00 2001
From: Maxwell G <gotmax(a)e.email>
Date: Sep 30 2022 20:51:12 +0000
Subject: Only build against ansible-core
We want the newest ansible-test, and we may add other macros that
require the newest version. The generated runtime Requires remain the
same.
https://src.fedoraproject.org/rpms/ansible/c/f246aba7759fd8ea181333fa827d...
makes this okay to reapply to F35.
---
diff --git a/ansible-packaging.spec b/ansible-packaging.spec
index 6a2b6f9..d769013 100644
--- a/ansible-packaging.spec
+++ b/ansible-packaging.spec
@@ -11,9 +11,9 @@ Source2: macros.ansible
Source3: macros.ansible-srpm
Source4: COPYING
-# Require either ansible-core or a version of ansible 2.9 that supports collections but prefer ansible-core.
-Requires: (ansible-core or (ansible < 2.10.0 with ansible >= 2.9.10))
-Suggests: ansible-core
+# Require ansible-core for building. Collections still have a boolean runtime
+# dependency on either ansible 2.9 OR ansible-core.
+Requires: ansible-core
Requires: ansible-srpm-macros = %{version}-%{release}
@@ -38,8 +38,6 @@ Summary: SRPM stage RPM packaging macros for Ansible collections
%package tests
Summary: Dependencies for Ansible collection package unit tests
Requires: %{name} = %{version}-%{release}
-# Unit tests use ansible-core not ansible 2.9.
-Requires: ansible-core
Requires: /usr/bin/ansible-test
# This list is taken from %%{python3_sitelib}/ansible_test/_data/requirements/units.txt
Requires: %{py3_dist pytest}
https://src.fedoraproject.org/rpms/ansible-packaging/c/f9f014a54d4f818097...
1Â year, 6Â months