Compare commits

...

No commits in common. "c9s" and "c8s" have entirely different histories.
c9s ... c8s

4 changed files with 69 additions and 115 deletions

3
.gitignore vendored
View File

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

View File

@ -1 +0,0 @@
d81c8fd0a0a4c206980a9b01fa27cbd1f458031c luafilesystem-1.8.0.tar.gz

View File

@ -1,154 +1,110 @@
%if 0%{?el7} %{!?luaver: %global luaver %(lua -e "print(string.sub(_VERSION, 5))" || echo 0)}
%bcond_with compat %global lualibdir %{_libdir}/lua/%{luaver}
%else
%bcond_without compat
%endif
%if %{with compat} %define luacompatver 5.1
%{!?lua_compat_version: %global lua_compat_version 5.1} %define luacompatlibdir %{_libdir}/lua/%{luacompatver}
%{!?lua_compat_libdir: %global lua_compat_libdir %{_libdir}/lua/%{lua_compat_version}} %define luacompatpkgdir %{_datadir}/lua/%{luacompatver}
%{!?lua_compat_builddir: %global lua_compat_builddir %{_builddir}/compat-lua-%{name}-%{version}-%{release}} %define lua51dir %{_builddir}/lua51-%{name}-%{version}-%{release}
%endif
%global commit 8014725009e195ffb502bcd65ca4e93b60a1b21c
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: lua-filesystem Name: lua-filesystem
Version: 1.8.0 Version: 1.6.3
Release: 4%{?dist} Release: 7%{?dist}
Summary: File System Library for the Lua Programming Language Summary: File System Library for the Lua Programming Language
%global gitowner keplerproject Group: Development/Libraries
%global gitproject luafilesystem
%global gittag %(echo %{version} | sed -e 's/\\./_/g')
License: MIT License: MIT
URL: https://%{gitowner}.github.io/%{gitproject}/ URL: http://www.keplerproject.org/luafilesystem/
Source0: https://github.com/%{gitowner}/%{gitproject}/archive/v%{gittag}/%{gitproject}-%{version}.tar.gz Source0: https://github.com/keplerproject/luafilesystem/archive/%{commit}/luafilesystem-%{version}.tar.gz
%if 0%{?el5}
BuildRequires: gcc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
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 %endif
%global _description %{expand: BuildRequires: lua-devel >= %{luaver}
%if 0%{?fedora}
Requires: lua(abi) = %{luaver}
%else
Requires: lua >= %{luaver}
%endif
%if 0%{?fedora} >= 20
BuildRequires: compat-lua >= %{luacompatver}, compat-lua-devel >= %{luacompatver}
%endif
%description
LuaFileSystem is a Lua library developed to complement the set of functions LuaFileSystem is a Lua library developed to complement the set of functions
related to file systems offered by the standard Lua distribution. related to file systems offered by the standard Lua distribution.
LuaFileSystem offers a portable way to access the underlying directory LuaFileSystem offers a portable way to access the underlying directory
structure and file attributes.} structure and file attributes.
%description %{_description} %if 0%{?fedora} >= 20
%package compat
Summary: File System Library for the Lua Programming Language 5.1
Group: Development/Libraries
%description compat
LuaFileSystem is a Lua library developed to complement the set of functions
related to file systems offered by the standard Lua distribution.
%if %{with compat} LuaFileSystem offers a portable way to access the underlying directory
%package -n lua%{lua_compat_version}-filesystem structure and file attributes.
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}
%endif %endif
Obsoletes: lua-filesystem-compat < 1.8.0-3
Provides: lua-filesystem-compat = %{version}-%{release}
Provides: lua-filesystem-compat%{?_isa} = %{version}-%{release}
%description -n lua%{lua_compat_version}-filesystem %{_description}
%endif
%prep %prep
%autosetup -n %{gitproject}-%{gittag} %setup -q -n luafilesystem-%{commit}
%if %{with compat} %if 0%{?fedora} >= 20
rm -rf %{lua_compat_builddir} rm -rf %{lua51dir}
cp -a . %{lua_compat_builddir} cp -a . %{lua51dir}
%endif %endif
%build %build
%make_build LUA_LIBDIR=%{lua_libdir} CFLAGS="%{optflags} -fPIC %{?__global_ldflags}" make %{?_smp_mflags} PREFIX=%{_prefix} LUA_LIBDIR=%{lualibdir} CFLAGS="%{optflags} -fPIC"
%if %{with compat} %if 0%{?fedora} >= 20
pushd %{lua_compat_builddir} pushd %{lua51dir}
%make_build LUA_LIBDIR=%{lua_compat_libdir} CFLAGS="-I%{_includedir}/lua-%{lua_compat_version} %{optflags} -fPIC %{?__global_ldflags}" make %{?_smp_mflags} PREFIX=%{_prefix} LUA_LIBDIR=%{luacompatlibdir} CFLAGS="-I%{_includedir}/lua-%{luacompatver} %{optflags} -fPIC"
popd popd
%endif %endif
%install %install
%make_install LUA_LIBDIR=%{lua_libdir} rm -rf $RPM_BUILD_ROOT
make install PREFIX=$RPM_BUILD_ROOT%{_prefix} LUA_LIBDIR=$RPM_BUILD_ROOT%{lualibdir}
%if %{with compat} %if 0%{?fedora} >= 20
pushd %{lua_compat_builddir} pushd %{lua51dir}
%make_install LUA_LIBDIR=%{lua_compat_libdir} make install PREFIX=$RPM_BUILD_ROOT%{_prefix} LUA_LIBDIR=$RPM_BUILD_ROOT%{luacompatlibdir}
popd popd
%endif %endif
%check %check
LUA_CPATH=%{buildroot}%{lua_libdir}/\?.so lua tests/test.lua LUA_CPATH=$RPM_BUILD_ROOT%{lualibdir}/\?.so lua tests/test.lua
%if %{with compat}
LUA_CPATH=%{buildroot}%{lua_compat_libdir}/\?.so lua-%{lua_compat_version} tests/test.lua %if 0%{?rhel}
%clean
rm -rf $RPM_BUILD_ROOT
%endif %endif
%files
%license LICENSE
%doc doc/us/*
%doc README.md
%{lua_libdir}/*
%if %{with compat} %files
%files -n lua%{lua_compat_version}-filesystem %defattr(-,root,root,-)
%license LICENSE
%doc doc/us/* %doc doc/us/*
%doc README.md %doc README
%{lua_compat_libdir}/* %{lualibdir}/*
%if 0%{?fedora} >= 20
%files compat
%defattr(-,root,root,-)
%doc doc/us/*
%doc README
%{luacompatlibdir}/*
%endif %endif
%changelog %changelog
* Sun Jan 31 2021 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.8.0-4
- Adjust conditionals for compat package
* Fri Jan 29 2021 Robert Scheck <robert@fedoraproject.org> - 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 <salimma@fedoraproject.org> - 1.8.0-2
- compat: Add Requires on lua(abi) for older releases
* 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
* Tue Jun 30 2020 Miro Hrončok <mhroncok@redhat.com> - 1.6.3-13
- Rebuilt for Lua 5.4
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-7 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.3-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

View File

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