From f228d263c8eac55baff04ed6d2c379fadf4132136a06487707962a26210c7b4e Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Mon, 24 Jul 2017 18:53:36 +0000 Subject: [PATCH] Accepting request 512261 from home:dimstar:Factory - Only move the lua bindings from /usr/local when needed: this was generally only a hack as our lua.pc 'forgot' to expose the variables INSTALL_CMOD. As lua is now being fixed, this hack is no longer needed (for compatibility with older/broken lua packages we keep it in place, but don't abort if the move failed). OBS-URL: https://build.opensuse.org/request/show/512261 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/rrdtool?expand=0&rev=77 --- rrdtool.changes | 10 ++++++++++ rrdtool.spec | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/rrdtool.changes b/rrdtool.changes index 37ae2ab..4e66cb7 100644 --- a/rrdtool.changes +++ b/rrdtool.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Jul 24 12:14:04 UTC 2017 - dimstar@opensuse.org + +- Only move the lua bindings from /usr/local when needed: this was + generally only a hack as our lua.pc 'forgot' to expose the + variables INSTALL_CMOD. As lua is now being fixed, this hack is + no longer needed (for compatibility with older/broken lua + packages we keep it in place, but don't abort if the move + failed). + ------------------------------------------------------------------- Mon Jul 3 11:22:55 UTC 2017 - tchvatal@suse.com diff --git a/rrdtool.spec b/rrdtool.spec index 2ede24d..6bf19ac 100644 --- a/rrdtool.spec +++ b/rrdtool.spec @@ -270,8 +270,8 @@ make \ %perl_process_packlist %if %{with lua} -# install ruby bindings manually -mv %{buildroot}%{_prefix}/local/lib/lua %{buildroot}%{_libdir}/lua +# Move lua lib to the right point, in case lua did not expose the right INSTALL_CMOD variable +mv %{buildroot}%{_prefix}/local/lib/lua %{buildroot}%{_libdir}/lua || true %endif %if %{with ruby}