From 7b446550256f76d42e4b7a17cdc6c639bf7047e9 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Sat, 30 Jan 2021 01:37:54 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/lua-filesystem.git#3f60b7e84ee4304341bed986f20578d97b290219 --- lua-filesystem.spec | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/lua-filesystem.spec b/lua-filesystem.spec index c8db330..985129e 100644 --- a/lua-filesystem.spec +++ b/lua-filesystem.spec @@ -12,7 +12,7 @@ Name: lua-filesystem Version: 1.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: File System Library for the Lua Programming Language %global gitowner keplerproject @@ -48,13 +48,16 @@ structure and file attributes.} %if %{with compat} -%package compat -Summary: File System Library for the Lua Programming Language 5.1 +%package -n lua%{lua_compat_version}-filesystem +Summary: File System Library for the Lua Programming Language %{lua_compat_version} %if 0%{?fedora} < 33 && 0%{?rhel} < 9 Requires: lua(abi) = %{lua_compat_version} +Obsoletes: lua-filesystem-compat < 1.8.0-3 +Provides: lua-filesystem-compat = %{version}-%{release} +Provides: lua-filesystem-compat%{?_isa} = %{version}-%{release} %endif -%description compat %{_description} +%description -n lua%{lua_compat_version}-filesystem %{_description} %endif @@ -67,26 +70,30 @@ cp -a . %{lua_compat_builddir} %endif %build -%make_build PREFIX=%{_prefix} LUA_LIBDIR=%{lua_libdir} CFLAGS="%{optflags} -fPIC" +%make_build LUA_LIBDIR=%{lua_libdir} CFLAGS="%{optflags} -fPIC %{?__global_ldflags}" %if %{with compat} pushd %{lua_compat_builddir} -%make_build PREFIX=%{_prefix} LUA_LIBDIR=%{lua_compat_libdir} CFLAGS="-I%{_includedir}/lua-%{lua_compat_version} %{optflags} -fPIC" +%make_build LUA_LIBDIR=%{lua_compat_libdir} CFLAGS="-I%{_includedir}/lua-%{lua_compat_version} %{optflags} -fPIC %{?__global_ldflags}" popd %endif %install -%make_install PREFIX=%{_prefix} LUA_LIBDIR=%{lua_libdir} +%make_install LUA_LIBDIR=%{lua_libdir} %if %{with compat} pushd %{lua_compat_builddir} -%make_install PREFIX=%{_prefix} LUA_LIBDIR=%{lua_compat_libdir} +%make_install LUA_LIBDIR=%{lua_compat_libdir} popd %endif %check LUA_CPATH=%{buildroot}%{lua_libdir}/\?.so lua tests/test.lua +%if %{with compat} +LUA_CPATH=%{buildroot}%{lua_compat_libdir}/\?.so lua-%{lua_compat_version} tests/test.lua +%endif + %files %license LICENSE %doc doc/us/* @@ -94,7 +101,7 @@ LUA_CPATH=%{buildroot}%{lua_libdir}/\?.so lua tests/test.lua %{lua_libdir}/* %if %{with compat} -%files compat +%files -n lua%{lua_compat_version}-filesystem %license LICENSE %doc doc/us/* %doc README.md @@ -102,6 +109,11 @@ LUA_CPATH=%{buildroot}%{lua_libdir}/\?.so lua tests/test.lua %endif %changelog +* Fri Jan 29 2021 Robert Scheck - 1.8.0-3 +- Use Fedora-specific linker flags +- Remove unused PREFIX argument at %%make_build and %%make_install +- compat: Extend %%check and rename package to match guidelines + * Wed Jan 27 2021 Michel Alexandre Salim - 1.8.0-2 - compat: Add Requires on lua(abi) for older releases