- Require lua macros rather than bundling them with lua itself

OBS-URL: https://build.opensuse.org/package/show/devel:languages:lua/lua53?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal 2017-07-10 11:33:09 +00:00 committed by Git OBS Bridge
parent c4bc6360aa
commit 9aea546af2
2 changed files with 8 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Jul 10 11:32:37 UTC 2017 - tchvatal@suse.com
- Require lua macros rather than bundling them with lua itself
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 7 13:31:06 UTC 2017 - tchvatal@suse.com Fri Jul 7 13:31:06 UTC 2017 - tchvatal@suse.com

View File

@ -26,13 +26,13 @@ License: MIT
Group: Development/Languages/Other Group: Development/Languages/Other
Url: http://www.lua.org Url: http://www.lua.org
Source: http://www.lua.org/ftp/lua-%{version}.tar.gz Source: http://www.lua.org/ftp/lua-%{version}.tar.gz
Source1: macros.lua Source99: baselibs.conf
Source2: baselibs.conf
# PATCH-FIX-SUSE tweak the buildsystem to produce what is needed for SUSE # PATCH-FIX-SUSE tweak the buildsystem to produce what is needed for SUSE
Patch0: lua-build-system.patch Patch0: lua-build-system.patch
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: lua-macros
Provides: lua = %{version} Provides: lua = %{version}
Provides: Lua(API) = %{major_version} Provides: Lua(API) = %{major_version}
@ -53,6 +53,7 @@ Summary: Development files for lua
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{libname} = %{version} Requires: %{libname} = %{version}
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: lua-macros
Provides: lua-devel = %{version} Provides: lua-devel = %{version}
Provides: Lua(devel) = %{major_version} Provides: Lua(devel) = %{major_version}
@ -122,7 +123,6 @@ make install \
V=%{major_version} \ V=%{major_version} \
INSTALL_TOP="%{buildroot}%{_prefix}" \ INSTALL_TOP="%{buildroot}%{_prefix}" \
INSTALL_LIB="%{buildroot}%{_libdir}" INSTALL_LIB="%{buildroot}%{_libdir}"
install -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/rpm/macros.lua
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
@ -215,7 +215,6 @@ fi
%{_libdir}/liblua.so.* %{_libdir}/liblua.so.*
%files devel %files devel
%config %{_sysconfdir}/rpm/macros.lua
%dir %{_includedir}/lua%{major_version} %dir %{_includedir}/lua%{major_version}
%{_includedir}/lua%{major_version}/lauxlib.h %{_includedir}/lua%{major_version}/lauxlib.h
%{_includedir}/lua%{major_version}/lua.h %{_includedir}/lua%{major_version}/lua.h