From 0d221d70aea739e6b03211e423995f23133fd6df272f1720ae77e6ed1608545e Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Sat, 22 May 2021 13:01:27 +0000 Subject: [PATCH 1/2] Accepting request 894973 from home:gmbr3:Lua - Fix doc location (boo#1186233) OBS-URL: https://build.opensuse.org/request/show/894973 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=34 --- lua54.changes | 5 +++++ lua54.spec | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lua54.changes b/lua54.changes index d0615a6..0d95f6c 100644 --- a/lua54.changes +++ b/lua54.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat May 22 12:58:16 UTC 2021 - Callum Farmer + +- Fix doc location (boo#1186233) + ------------------------------------------------------------------- Mon May 10 08:54:04 UTC 2021 - Callum Farmer diff --git a/lua54.spec b/lua54.spec index e5def00..cee7dfe 100644 --- a/lua54.spec +++ b/lua54.spec @@ -24,6 +24,7 @@ %endif %define major_version 5.4 %define libname liblua5_4-5 +%define lua_docdir %{_datadir}/doc/lua%{major_version} Name: lua54%{name_ext} Version: 5.4.3 Release: 0 @@ -121,6 +122,7 @@ of C functions, written in ANSI C. Summary: Documentation for Lua, a small embeddable language Group: Documentation/HTML BuildArch: noarch +Supplements: (lua54 and patterns-base-documentation) %description doc Lua is a programming language originally designed for extending @@ -207,6 +209,10 @@ touch %{buildroot}%{_sysconfdir}/alternatives/liblua.so ln -sf %{_sysconfdir}/alternatives/liblua.so %{buildroot}%{_libdir}/liblua.so touch %{buildroot}%{_sysconfdir}/alternatives/lua.pc ln -sf %{_sysconfdir}/alternatives/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.pc +# doc +mkdir -p %{buildroot}%{lua_docdir}/doc +install -Dm644 README %{buildroot}%{lua_docdir} +install -Dm644 doc/* %{buildroot}%{lua_docdir}/doc %else %check LD_LIBRARY_PATH=%{_libdir} %{_bindir}/lua%{major_version} all.lua @@ -239,7 +245,8 @@ if [ "$1" = 0 ] ; then fi %files -%doc README +%dir %{lua_docdir} +%doc %{lua_docdir}/README %dir %{_libdir}/lua %dir %{_libdir}/lua/%{major_version} %dir %{_datadir}/lua @@ -278,7 +285,8 @@ fi %ghost %{_sysconfdir}/alternatives/lua.pc %files doc -%doc doc/* +%dir %{lua_docdir}/doc +%doc %{lua_docdir}/doc/* %endif %changelog From 8bc2aae476f4d64557b73b692132efeb96d7da65b4229cf19415d70a504255fd Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Tue, 25 May 2021 08:39:05 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=35 --- lua54.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lua54.spec b/lua54.spec index cee7dfe..2e49e84 100644 --- a/lua54.spec +++ b/lua54.spec @@ -213,6 +213,7 @@ ln -sf %{_sysconfdir}/alternatives/lua.pc %{buildroot}%{_libdir}/pkgconfig/lua.p mkdir -p %{buildroot}%{lua_docdir}/doc install -Dm644 README %{buildroot}%{lua_docdir} install -Dm644 doc/* %{buildroot}%{lua_docdir}/doc +rm %{buildroot}%{lua_docdir}/doc/*.1 %else %check LD_LIBRARY_PATH=%{_libdir} %{_bindir}/lua%{major_version} all.lua