From b128815ef3a6078d8dfd34246c0e293b0cb40b7af7d677adcc043c314f7d911c Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 31 Oct 2018 15:27:27 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-macros?expand=0&rev=5 --- lua-macros.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua-macros.spec b/lua-macros.spec index f707609..233d63a 100644 --- a/lua-macros.spec +++ b/lua-macros.spec @@ -24,7 +24,7 @@ License: MIT Group: Development/Languages/Other Url: http://www.lua.org Source0: macros.lua -Requires: lua +Requires: (lua51 or lua52 or lua53) BuildArch: noarch %description From d9ec45ebe4d85430b2ad6c4e9c7aed2a93fd60a201f2d4119c318a340c6ac7e5 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 31 Oct 2018 15:29:55 +0000 Subject: [PATCH 2/3] Remove conditional requirements OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-macros?expand=0&rev=6 --- lua-macros.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lua-macros.spec b/lua-macros.spec index 233d63a..f7a44a6 100644 --- a/lua-macros.spec +++ b/lua-macros.spec @@ -1,7 +1,7 @@ # # spec file for package lua-macros # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ License: MIT Group: Development/Languages/Other Url: http://www.lua.org Source0: macros.lua -Requires: (lua51 or lua52 or lua53) +Requires: lua BuildArch: noarch %description From 6f5d372c3e31a991149b30265d217b22090be15e8ddc557998ead2c1ba0add12 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 12 Apr 2020 13:40:29 +0000 Subject: [PATCH 3/3] Accepting request 793405 from home:mcepl:neovim - Modify lua_incdir to work even on Fedora/RHEL - Install into /usr/lib/ not libexec OBS-URL: https://build.opensuse.org/request/show/793405 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua-macros?expand=0&rev=7 --- lua-macros.changes | 10 ++++++++++ lua-macros.spec | 13 ++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/lua-macros.changes b/lua-macros.changes index 0db859d..012fffe 100644 --- a/lua-macros.changes +++ b/lua-macros.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sun Apr 12 13:22:39 UTC 2020 - Matej Cepl + +- Modify lua_incdir to work even on Fedora/RHEL + +------------------------------------------------------------------- +Sun Apr 12 13:14:02 UTC 2020 - Matej Cepl + +- Install into /usr/lib/ not libexec + ------------------------------------------------------------------- Tue Jul 11 08:24:18 UTC 2017 - tchvatal@suse.com diff --git a/lua-macros.spec b/lua-macros.spec index f7a44a6..936266f 100644 --- a/lua-macros.spec +++ b/lua-macros.spec @@ -1,7 +1,7 @@ # # spec file for package lua-macros # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,7 +22,7 @@ Release: 0 Summary: Macros for lua language License: MIT Group: Development/Languages/Other -Url: http://www.lua.org +URL: https://www.lua.org Source0: macros.lua Requires: lua BuildArch: noarch @@ -31,15 +31,18 @@ BuildArch: noarch RPM macros for lua packaging %prep -: +cp -p %{SOURCE0} . +%if 0%{?rhel} || 0%{?fedora} +sed -i -e '/includedir/s!/lua!&-!' macros.lua +%endif %build : %install -install -D -m 644 %{SOURCE0} %{buildroot}%{_libexecdir}/rpm/macros.d/macros.lua +install -D -m 644 macros.lua %{buildroot}%{_usr}/lib/rpm/macros.d/macros.lua %files -%{_libexecdir}/rpm/macros.d/macros.lua +%{_usr}/lib/rpm/macros.d/macros.lua %changelog