From a04ac877750dc68518153cf16f155178057c954148a16d61968374e9b1948c39 Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Wed, 9 Mar 2022 09:12:20 +0000 Subject: [PATCH] Accepting request 959924 from home:iznogood:branches:devel:languages:lua - Drop the lua_docdir define, package docs in the standard location. Instead just silently drop packaging the README with the path that does not makes sense for a rpm package, but for a source tarball install. Simpler solution to boo#1186233. OBS-URL: https://build.opensuse.org/request/show/959924 OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua54?expand=0&rev=51 --- lua54.changes | 8 ++++++++ lua54.spec | 12 ++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lua54.changes b/lua54.changes index 13502f6..0da7f6b 100644 --- a/lua54.changes +++ b/lua54.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Mar 7 10:19:17 UTC 2022 - Bjørn Lie + +- Drop the lua_docdir define, package docs in the standard + location. Instead just silently drop packaging the README with + the path that does not makes sense for a rpm package, but for a + source tarball install. Simpler solution to boo#1186233. + ------------------------------------------------------------------- Wed Jan 26 19:15:13 UTC 2022 - Callum Farmer diff --git a/lua54.spec b/lua54.spec index 995e523..d40fa91 100644 --- a/lua54.spec +++ b/lua54.spec @@ -24,7 +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.4 Release: 0 @@ -204,11 +204,6 @@ 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 -rm %{buildroot}%{lua_docdir}/doc/*.1 %else %check LD_LIBRARY_PATH=%{_libdir} %{_bindir}/lua%{major_version} all.lua @@ -241,8 +236,6 @@ if [ "$1" = 0 ] ; then fi %files -%dir %{lua_docdir} -%doc %{lua_docdir}/README %dir %{_libdir}/lua %dir %{_libdir}/lua/%{major_version} %dir %{_datadir}/lua @@ -281,8 +274,7 @@ fi %ghost %{_sysconfdir}/alternatives/lua.pc %files doc -%dir %{lua_docdir}/doc -%doc %{lua_docdir}/doc/* +%doc doc/* %endif %changelog