From b5c3a86d725d901dbeea8ae403876cdc335ca4b45d039d274593372fa6a689e7 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 27 Jan 2023 13:43:00 +0000 Subject: [PATCH 1/2] Accepting request 1061407 from home:gladiac:branches:devel:languages:lua - Update to version 3.6.7: * https://github.com/sumneko/lua-language-server/blob/3.6.7/changelog.md or packaged changelog.md - Fixed setting CFLAGS and LDFLAGS - Added %check section - Moved lua-language-server binary to /usr/libexec OBS-URL: https://build.opensuse.org/request/show/1061407 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-language-server?expand=0&rev=27 --- 3.5.6.tar.gz | 3 --- 3.6.7.tar.gz | 3 +++ README.suse-maint.md | 4 ++-- _service | 4 ++-- lua-language-server-3.5.6-submodules.zip | 3 --- lua-language-server-3.6.7-submodules.zip | 3 +++ lua-language-server.changes | 9 +++++++++ lua-language-server.spec | 21 ++++++++++++--------- lua-lsp-launcher.sh | 4 ++-- 9 files changed, 33 insertions(+), 21 deletions(-) delete mode 100644 3.5.6.tar.gz create mode 100644 3.6.7.tar.gz delete mode 100644 lua-language-server-3.5.6-submodules.zip create mode 100644 lua-language-server-3.6.7-submodules.zip diff --git a/3.5.6.tar.gz b/3.5.6.tar.gz deleted file mode 100644 index 90ec3c8..0000000 --- a/3.5.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8370df4cac05677028cff36743795b3d63be2a1d033e8b7d16c8d553563c2ee7 -size 3133740 diff --git a/3.6.7.tar.gz b/3.6.7.tar.gz new file mode 100644 index 0000000..abaa40b --- /dev/null +++ b/3.6.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23813deabe59f105f440410b3c9a59b616d5bbbf5ae784617af4c95499848aae +size 3289636 diff --git a/README.suse-maint.md b/README.suse-maint.md index b2f7360..b77e1b4 100644 --- a/README.suse-maint.md +++ b/README.suse-maint.md @@ -2,9 +2,9 @@ ## Prerequisites: -You need the `tar_scm` obs service installed: +You need the `tar_scm` and `download_url` obs service installed: - zypper in obs-service-tar_scm + zypper in obs-service-tar_scm obs-service-download_url ## Updating to a new version from upstream diff --git a/_service b/_service index c8671b9..ffb99f1 100644 --- a/_service +++ b/_service @@ -4,14 +4,14 @@ @PARENT_TAG@ git .git - 16f4d9c + 8da1d0d2158d73934b7c4af0a1e691fc1d58c639 (.*) \1 https github.com - sumneko/lua-language-server/releases/download/3.5.6/lua-language-server-3.5.6-submodules.zip + sumneko/lua-language-server/releases/download/3.6.7/lua-language-server-3.6.7-submodules.zip diff --git a/lua-language-server-3.5.6-submodules.zip b/lua-language-server-3.5.6-submodules.zip deleted file mode 100644 index b87f9f5..0000000 --- a/lua-language-server-3.5.6-submodules.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e93879645e8fd7de8b434f8db4825e29960806805f1612f34765a359251e1059 -size 30682527 diff --git a/lua-language-server-3.6.7-submodules.zip b/lua-language-server-3.6.7-submodules.zip new file mode 100644 index 0000000..9e9cb93 --- /dev/null +++ b/lua-language-server-3.6.7-submodules.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba0489a3dae507781e4b957cecc1a2accac5a0a2a543dd5fe09e69bb41e5114a +size 32326158 diff --git a/lua-language-server.changes b/lua-language-server.changes index 15c00bd..27f697e 100644 --- a/lua-language-server.changes +++ b/lua-language-server.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jan 26 18:50:47 UTC 2023 - Andreas Schneider + +- Update to version 3.6.7: + * https://github.com/sumneko/lua-language-server/blob/3.6.7/changelog.md + or packaged changelog.md +- Added %check section +- Moved lua-language-server binary to /usr/libexec + ------------------------------------------------------------------- Sat Sep 24 10:17:33 UTC 2022 - Soc Virnyl Estela diff --git a/lua-language-server.spec b/lua-language-server.spec index aebc773..8728b8e 100644 --- a/lua-language-server.spec +++ b/lua-language-server.spec @@ -1,7 +1,7 @@ # # spec file for package lua-language-server # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # Copyright (c) 2021 Andreas Schneider # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: lua-language-server -Version: 3.5.6 +Version: 3.6.7 Release: 0 Summary: Lua Language Server coded by Lua License: MIT @@ -49,11 +49,11 @@ export CFLAGS="%{optflags}" export CXXFLAGS="%{optflags}" ninja -C 3rd/luamake -f compile/ninja/linux.ninja -./3rd/luamake/luamake rebuild +./3rd/luamake/luamake all %install -install -d -m 0755 %{buildroot}%{_libdir}/%{name} -cp -av bin/* %{buildroot}%{_libdir}/%{name} +install -d -m 0755 %{buildroot}%{_libexecdir}/%{name} +cp -av bin/* %{buildroot}%{_libexecdir}/%{name} install -d -m 0755 %{buildroot}%{_datadir}/%{name} cp -av \ @@ -65,16 +65,19 @@ cp -av \ %{buildroot}%{_datadir}/%{name}/ install -d -m 0755 %{buildroot}%{_bindir} -sed -e 's#@LIBDIR@#%{_libdir}#' %{SOURCE2} > %{buildroot}%{_bindir}/%{name} +sed -e 's#@LIBEXECDIR@#%{_libexecdir}#' %{SOURCE2} > %{buildroot}%{_bindir}/%{name} chmod 0755 %{buildroot}%{_bindir}/%{name} -%fdupes %{buildroot}%{_libdir}/%{name} +%fdupes %{buildroot}%{_libexecdir}/%{name} + +%check +./3rd/luamake/luamake bee-test unit-test %files %license LICENSE -%doc README.md +%doc README.md changelog.md %{_bindir}/%{name} -%{_libdir}/%{name}/ +%{_libexecdir}/%{name}/ %{_datadir}/%{name}/ %changelog diff --git a/lua-lsp-launcher.sh b/lua-lsp-launcher.sh index 4428883..5ef395c 100644 --- a/lua-lsp-launcher.sh +++ b/lua-lsp-launcher.sh @@ -1,12 +1,12 @@ #!/bin/sh -cd /usr/share/lua-language-server/ +cd /usr/share/lua-language-server/ || exit 1 TMPPATH=$(mktemp -d "/tmp/lua-language-server.XXXX") DEFAULT_LOGPATH="${TMPPATH}/log" DEFAULT_METAPATH="${TMPPATH}/meta" -exec @LIBDIR@/lua-language-server/lua-language-server \ +exec @LIBEXECDIR@/lua-language-server/lua-language-server \ -E ./main.lua \ --logpath="${DEFAULT_LOGPATH}" \ --metapath="${DEFAULT_METAPATH}" \ From 9d0a70a95bf95866a454a8b92a22ef21bc59a45498925f41038ccd7262f8ada4 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 27 Jan 2023 14:50:17 +0000 Subject: [PATCH 2/2] Fix SPEC file OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-language-server?expand=0&rev=28 --- lua-language-server.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua-language-server.spec b/lua-language-server.spec index 8728b8e..690e4d4 100644 --- a/lua-language-server.spec +++ b/lua-language-server.spec @@ -68,7 +68,7 @@ install -d -m 0755 %{buildroot}%{_bindir} sed -e 's#@LIBEXECDIR@#%{_libexecdir}#' %{SOURCE2} > %{buildroot}%{_bindir}/%{name} chmod 0755 %{buildroot}%{_bindir}/%{name} -%fdupes %{buildroot}%{_libexecdir}/%{name} +%fdupes %{buildroot}%{_libexecdir}/%{name} %{buildroot}%{_datadir}/%{name} %check ./3rd/luamake/luamake bee-test unit-test