diff options
Diffstat (limited to 'lua.spec')
-rw-r--r-- | lua.spec | 63 |
1 files changed, 7 insertions, 56 deletions
@@ -10,18 +10,11 @@ Group: Development/Languages License: MIT URL: http://www.lua.org/ Source0: http://www.lua.org/ftp/lua-%{version}.tar.gz -Source1: http://www.lua.org/ftp/lua-%{legacy_version}.tar.gz Patch0: %{name}-%{version}-autotoolize.patch Patch1: %{name}-%{version}-idsize.patch Patch2: %{name}-%{version}-luac-shared-link-fix.patch Patch3: %{name}-%{version}-configure-compat-module.patch Patch4: %{name}-%{version}-configure-linux.patch -# Legacy patches for compat-lua-libs -Patch10: lua-5.1.4-autotoolize.patch -Patch11: lua-5.1.4-lunatic.patch -Patch12: lua-5.1.4-idsize.patch -Patch13: lua-5.1.4-2.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: automake autoconf libtool readline-devel ncurses-devel Provides: lua(abi) = %{major_version} @@ -52,17 +45,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description static This package contains the static version of liblua for %{name}. -%package -n compat-lua-libs -Version: %{legacy_version} -Summary: Powerful light-weight programming language (compat version) -Provides: lua(abi) = %{legacy_version} -Provides: lua = %{legacy_version} - -%description -n compat-lua-libs -This package contains a compatibility version of lua (%{legacy_version}). %prep -%setup -q -a 1 +%setup -q mv src/luaconf.h src/luaconf.h.template.in %patch0 -p1 -E -z .autoxxx %patch1 -p1 -z .idsize @@ -71,15 +56,6 @@ mv src/luaconf.h src/luaconf.h.template.in %patch4 -p1 -z .configure-linux autoreconf -i -# legacy -pushd lua-%{legacy_version} -%patch10 -p1 -E -z .legacy-autoxxx -%patch11 -p0 -z .legacy-lunatic -%patch12 -p1 -z .legacy-idsize -%patch13 -p0 -d src -z .legacy-bugfix2 -# fix perms on auto files -chmod u+x autogen.sh config.guess config.sub configure depcomp install-sh missing -popd %build %configure --with-readline --with-compat-module @@ -92,35 +68,15 @@ sed -i 's|@pkgdatadir@|%{_datadir}|g' src/luaconf.h.template # only one which needs this and otherwise we get License troubles make %{?_smp_mflags} LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl" -# legacy -pushd lua-%{legacy_version} -%configure --with-readline -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -# hack so that only /usr/bin/lua gets linked with readline as it is the -# only one which needs this and otherwise we get License troubles -make %{?_smp_mflags} LIBS="-lm -ldl" luac_LDADD="liblua.la -lm -ldl" -popd %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/*.la mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{major_version} mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{major_version} -# legacy -pushd lua-%{legacy_version} -cp -a ./src/.libs/liblua-%{legacy_major_version}.so $RPM_BUILD_ROOT%{_libdir}/ -mkdir -p $RPM_BUILD_ROOT%{_libdir}/lua/%{legacy_major_version} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/lua/%{legacy_major_version} -popd - -%clean -rm -rf $RPM_BUILD_ROOT %files -%defattr(-,root,root,-) %doc README doc/*.html doc/*.css doc/*.gif doc/*.png %{_bindir}/lua %{_bindir}/luac @@ -132,25 +88,20 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/lua/%{major_version} %files devel -%defattr(-,root,root,-) %{_includedir}/l*.h %{_includedir}/l*.hpp %{_libdir}/liblua.so %{_libdir}/pkgconfig/*.pc %files static -%defattr(-,root,root,-) %{_libdir}/*.a -%files -n compat-lua-libs -%doc lua-%{legacy_version}/README -%{_libdir}/liblua-5.1.so -%dir %{_libdir}/lua -%dir %{_libdir}/lua/%{legacy_major_version} -%dir %{_datadir}/lua -%dir %{_datadir}/lua/%{legacy_major_version} %changelog +* Mon Aug 05 2013 Hans de Goede <hdegoede@redhat.com> - 5.2.2-3 +- Drop compat-lua-libs package, as there now is a separate compat-lua + package (including a -devel) + * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -243,7 +194,7 @@ rm -rf $RPM_BUILD_ROOT - New upstream release 5.1.1 - Fix detection of readline during compile (iow add readline support back) -* Mon Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-7 +* Sun Aug 27 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-7 - Rebuild for FC6 * Thu Jun 08 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.1-6 @@ -271,7 +222,7 @@ rm -rf $RPM_BUILD_ROOT * Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 5.0.2-4 - rebuild on all arches -* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.0.2-3 +* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.0.2-3 - rebuilt * Sat Feb 12 2005 David Woodhouse <dwmw2@infradead.org> - 5.0.2-2 |