From f12b3585f37c3fe220696b6b824028a0e88f3770 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: May 03 2018 16:43:20 +0000 Subject: Update to 11.1 --- diff --git a/.gitignore b/.gitignore index a97d6b9..461bde8 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /0.10.0.tar.gz /0.10.1.tar.gz /0.10.2.tar.gz +/love-11.1.tar.gz diff --git a/love-0.10.2-luajit2.1.0beta3.patch b/love-0.10.2-luajit2.1.0beta3.patch deleted file mode 100644 index 2f132f3..0000000 --- a/love-0.10.2-luajit2.1.0beta3.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User Bart van Strien -# Date 1493809570 -7200 -# Node ID 10f58e78bbfd82b681a45aeaf1177a765726bb31 -# Parent 33511fb56ffe3f7a9d3d1471114743e2e725d6fa -Fix luasocket compatibility with luajit 2.1.0 beta 3 (fix #1277) - -Note that luasocket 3.0 (in minor) targets lua 5.1, so it does not rely on a -5.0 compatibility feature, and does not require this patch. Since a 0.10.3 -release seems unlikely at this point, this commit is mostly targeted at future -packagers of older love versions. - -diff --git a/src/libraries/luasocket/libluasocket/lua.h b/src/libraries/luasocket/libluasocket/lua.h ---- a/src/libraries/luasocket/libluasocket/lua.h -+++ b/src/libraries/luasocket/libluasocket/lua.h -@@ -6,9 +6,12 @@ - #include - #include - --#if LUA_VERSION_NUM > 501 -+#if LUA_VERSION_NUM >= 501 -+# undef luaL_reg - # define luaL_reg luaL_Reg -+# undef luaL_putchar - # define luaL_putchar(B, c) luaL_addchar(B, c) -+# undef luaL_typerror - # define luaL_typerror(L, n, t) luax_typerror(L, n, t) - - extern int luax_typerror(lua_State *L, int narg, const char *type); diff --git a/love.spec b/love.spec index 743e08d..27e5c05 100644 --- a/love.spec +++ b/love.spec @@ -5,27 +5,19 @@ %global luadep lua %endif +# Git commit tag, source folder name is rude-love-{gittag} +%global gittag 0ab246b5045d + Name: love -Version: 0.10.2 -Release: 12%{?dist} +Version: 11.1 +Release: 1%{?dist} Summary: A free 2D game engine which enables easy game creation in Lua #All is licensed as zlib with one exception: #SOURCE/platform/unix/ltmain.sh is public domain License: zlib and Public Domain URL: http://love2d.org -Source0: https://bitbucket.org/rude/%{name}/get/%{version}.tar.gz - -#From upstream: -#https://bitbucket.org/rude/love/commits/10f58e78bbfd82b681a45aeaf1177a765726bb31 -%if 0%{?fedora} > 25 -Patch1: %{name}-%{version}-luajit2.1.0beta3.patch -%endif - -#ppc64le is not supported prior to f28, excluding for legacy: -%if 0%{?fedora} < 28 -ExcludeArch: ppc64le -%endif +Source0: https://bitbucket.org/rude/%{name}/get/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: desktop-file-utils BuildRequires: freetype-devel @@ -37,7 +29,6 @@ BuildRequires: libtool BuildRequires: libvorbis-devel BuildRequires: %{luadep}-devel BuildRequires: openal-soft-devel -BuildRequires: physfs-devel BuildRequires: SDL2-devel Requires: lib%{name}%{?_isa} = %{version}-%{release} Requires: hicolor-icon-theme @@ -50,8 +41,10 @@ Requires: hicolor-icon-theme #https://bitbucket.org/rude/love/issues/870/allow-for-shared-version-of-libraries Provides: bundled(Box2D) = 2.3.0 Provides: bundled(enet) = 1.3.13 -Provides: bundled(luasocket) = 2.0.2 -Provides: bundled(lz4) = 1.7.0 +#Luasocket 3.0 rc1: +Provides: bundled(luasocket) = 3.0 +Provides: bundled(lz4) = 1.8.0 +Provides: bundled(physfs) = 3.0.1 %description LOVE is an open source, cross platform 2D game engine which uses the @@ -68,11 +61,11 @@ Lua scripting language. LOVE can be used to make games of any license allowing it to be used for both free and non-free projects. %prep -%autosetup -p1 -n rude-%{name}-afc69c4f7145 +%autosetup -p1 -n rude-%{name}-%{gittag} #Fixing line encoding: sed -i 's/\r//' license.txt #Fixing permissions: -chmod -x src/*/*/*.* src/libraries/Box2D/*/*.* src/libraries/Box2D/*/*/*.* +chmod a-x src/libraries/*/*/*/*.* src/libraries/*/*.* %build platform/unix/automagic @@ -109,9 +102,12 @@ rm -f %{buildroot}%{_libdir}/lib%{name}.la %doc changes.txt readme.md %license license.txt #Note that liblove.so is just a symlink, so a devel package is useless -%{_libdir}/lib%{name}.* +%{_libdir}/lib%{name}*.so %changelog +* Thu May 03 2018 Jeremy Newton - 11.1-1 +- Update to 11.1 + * Thu May 03 2018 Jeremy Newton - 0.10.2-12 - Update bundle info - Cleanup build requires diff --git a/sources b/sources index 5ac290c..664ad9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b0ac22b0471dc000eb4e09cbe86bfa6a 0.10.2.tar.gz +SHA512 (love-11.1.tar.gz) = caba2847bfb5e7bfa9adba53859d403c81c195693577314c94b3ca2c85bf1026b604a9ca01648b551f6216f4a1ce68cf641a87c15640d54819d7dfd6be2fd4fa