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#72a04651b1cf20423bc42c9a63a8e83109416e02
This commit is contained in:
DistroBaker 2021-01-28 00:06:33 +00:00
parent 7e0eb084a3
commit bef5a62ccb
3 changed files with 68 additions and 54 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/luafilesystem-1.6.2.tar.gz
/luafilesystem-1.6.3.tar.gz
/luafilesystem-1.8.0.tar.gz

View File

@ -1,99 +1,112 @@
%{!?luaver: %global luaver %(lua -e "print(string.sub(_VERSION, 5))" || echo 0)}
%global lualibdir %{_libdir}/lua/%{luaver}
%if 0%{?el7}
%bcond_with compat
%else
%bcond_without compat
%endif
%define luacompatver 5.1
%define luacompatlibdir %{_libdir}/lua/%{luacompatver}
%define luacompatpkgdir %{_datadir}/lua/%{luacompatver}
%define lua51dir %{_builddir}/lua51-%{name}-%{version}-%{release}
%global commit 8014725009e195ffb502bcd65ca4e93b60a1b21c
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%if %{with compat}
%{!?lua_compat_version: %global lua_compat_version 5.1}
%{!?lua_compat_libdir: %global lua_compat_libdir %{_libdir}/lua/%{lua_compat_version}}
%{!?lua_compat_builddir: %global lua_compat_builddir %{_builddir}/compat-lua-%{name}-%{version}-%{release}}
%endif
Name: lua-filesystem
Version: 1.6.3
Release: 14%{?dist}
Version: 1.8.0
Release: 1%{?dist}
Summary: File System Library for the Lua Programming Language
%global gitowner keplerproject
%global gitproject luafilesystem
%global gittag %(echo %{version} | sed -e 's/\\./_/g')
License: MIT
URL: http://www.keplerproject.org/luafilesystem/
Source0: https://github.com/keplerproject/luafilesystem/archive/%{commit}/luafilesystem-%{version}.tar.gz
%if 0%{?el5}
%endif
URL: https://%{gitowner}.github.io/%{gitproject}/
Source0: https://github.com/%{gitowner}/%{gitproject}/archive/v%{gittag}/%{gitproject}-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: lua-devel >= %{luaver}
%if 0%{?fedora}
Requires: lua(abi) = %{luaver}
%else
Requires: lua >= %{luaver}
BuildRequires: make
BuildRequires: lua-devel >= 5.1
%if 0%{?el7}
BuildRequires: lua-rpm-macros
%endif
%if %{with compat}
BuildRequires: compat-lua >= %{lua_compat_version}
BuildRequires: compat-lua-devel >= %{lua_compat_version}
%endif
%if 0%{?fedora} < 33 && 0%{?rhel} < 9
Requires: lua(abi) = %{lua_version}
%endif
%if 0%{?fedora} >= 20
BuildRequires: compat-lua >= %{luacompatver}, compat-lua-devel >= %{luacompatver}
%endif
%description
%global _description %{expand:
LuaFileSystem is a Lua library developed to complement the set of functions
related to file systems offered by the standard Lua distribution.
LuaFileSystem offers a portable way to access the underlying directory
structure and file attributes.
structure and file attributes.}
%if 0%{?fedora} >= 20
%description %{_description}
%if %{with compat}
%package compat
Summary: File System Library for the Lua Programming Language 5.1
%description compat
LuaFileSystem is a Lua library developed to complement the set of functions
related to file systems offered by the standard Lua distribution.
LuaFileSystem offers a portable way to access the underlying directory
structure and file attributes.
%description compat %{_description}
%endif
%prep
%setup -q -n luafilesystem-%{commit}
%if 0%{?fedora} >= 20
rm -rf %{lua51dir}
cp -a . %{lua51dir}
%prep
%autosetup -n %{gitproject}-%{gittag}
%if %{with compat}
rm -rf %{lua_compat_builddir}
cp -a . %{lua_compat_builddir}
%endif
%build
make %{?_smp_mflags} PREFIX=%{_prefix} LUA_LIBDIR=%{lualibdir} CFLAGS="%{optflags} -fPIC"
%make_build PREFIX=%{_prefix} LUA_LIBDIR=%{lua_libdir} CFLAGS="%{optflags} -fPIC"
%if 0%{?fedora} >= 20
pushd %{lua51dir}
make %{?_smp_mflags} PREFIX=%{_prefix} LUA_LIBDIR=%{luacompatlibdir} CFLAGS="-I%{_includedir}/lua-%{luacompatver} %{optflags} -fPIC"
%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"
popd
%endif
%install
rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix} LUA_LIBDIR=$RPM_BUILD_ROOT%{lualibdir}
%make_install PREFIX=%{_prefix} LUA_LIBDIR=%{lua_libdir}
%if 0%{?fedora} >= 20
pushd %{lua51dir}
make install PREFIX=$RPM_BUILD_ROOT%{_prefix} LUA_LIBDIR=$RPM_BUILD_ROOT%{luacompatlibdir}
%if %{with compat}
pushd %{lua_compat_builddir}
%make_install PREFIX=%{_prefix} LUA_LIBDIR=%{lua_compat_libdir}
popd
%endif
%check
LUA_CPATH=$RPM_BUILD_ROOT%{lualibdir}/\?.so lua tests/test.lua
LUA_CPATH=%{buildroot}%{lua_libdir}/\?.so lua tests/test.lua
%files
%license LICENSE
%doc doc/us/*
%doc README
%{lualibdir}/*
%doc README.md
%{lua_libdir}/*
%if 0%{?fedora} >= 20
%if %{with compat}
%files compat
%license LICENSE
%doc doc/us/*
%doc README
%{luacompatlibdir}/*
%doc README.md
%{lua_compat_libdir}/*
%endif
%changelog
* Wed Jan 27 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.8.0-1
- Update to 1.8.0
- Simplify spec to use new Lua macros (thanks robert@fp.o)
- Use standard make macros (thanks tbaeder@fp.o)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

View File

@ -1 +1 @@
3b1c92fd44390f09cd6c5f1fa21e2d17 luafilesystem-1.6.3.tar.gz
SHA512 (luafilesystem-1.8.0.tar.gz) = 79d964f13ae43716281dc8521d2f128b22f2261234c443e242b857cfdf621e208bdf4512f8ba710baa113e9b3b71e2544609de65e2c483f569c243a5cf058247