Hello community, here is the log from the commit of package minetest for openSUSE:Factory checked in at 2020-06-24 15:48:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minetest (Old) and /work/SRC/openSUSE:Factory/.minetest.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minetest" Wed Jun 24 15:48:30 2020 rev:13 rq:816473 version:5.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/minetest/minetest.changes 2020-04-07 10:32:55.986624580 +0200 +++ /work/SRC/openSUSE:Factory/.minetest.new.2956/minetest.changes 2020-06-24 15:48:35.904332617 +0200 @@ -1,0 +2,9 @@ +Mon Jun 22 12:41:37 UTC 2020 - Mia Herkt <m...@0x0.st> + +- spec-cleaner +- Make sure the package does not build with bundled libraries +- Add minetest-fix-luajit-include-path.patch + Fixes the FindLuaJIT CMake module so it also looks for the + moonjit include path + +------------------------------------------------------------------- New: ---- minetest-fix-luajit-include-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minetest.spec ++++++ --- /var/tmp/diff_new_pack.mp0KH6/_old 2020-06-24 15:48:37.120337715 +0200 +++ /var/tmp/diff_new_pack.mp0KH6/_new 2020-06-24 15:48:37.120337715 +0200 @@ -1,7 +1,7 @@ # # spec file for package minetest # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -37,6 +37,8 @@ Source: https://github.com/minetest/%{name}/archive/%{version}/%{name}-%{version}.tar.gz Source1: minetest-rpmlintrc Source2: minetest@.service +# PATCH-FIX-UPSTREAM - minetest-fix-luajit-include-path.diff -- Fixes the FindLuaJIT CMake module so it also looks for moonjit’s include path +Patch0: minetest-fix-luajit-include-path.patch BuildRequires: cmake BuildRequires: desktop-file-utils BuildRequires: doxygen @@ -49,11 +51,11 @@ BuildRequires: google-droid-fonts BuildRequires: hicolor-icon-theme BuildRequires: irrlicht-devel -BuildRequires: libjpeg-devel BuildRequires: libXxf86vm-devel +BuildRequires: libjpeg-devel BuildRequires: ncurses-devel -BuildRequires: spatialindex-devel BuildRequires: pkgconfig +BuildRequires: spatialindex-devel BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files BuildRequires: pkgconfig(bzip2) @@ -134,9 +136,10 @@ %prep %setup -q +%autopatch -p1 -# Purge bundled jsoncpp and lua. -rm -rf src/json src/lua src/gmp +# Purge bundled libraries. +rm -rf lib %build %cmake \ @@ -165,7 +168,7 @@ %else -DENABLE_POSTGRESQL=OFF %endif -make %{?_smp_mflags} V=1 +%make_build %install %cmake_install ++++++ minetest-fix-luajit-include-path.patch ++++++ diff -ru minetest-5.2.0.orig/cmake/Modules/FindLuaJIT.cmake minetest-5.2.0/cmake/Modules/FindLuaJIT.cmake --- minetest-5.2.0.orig/cmake/Modules/FindLuaJIT.cmake 2020-04-05 18:31:50.000000000 +0200 +++ minetest-5.2.0/cmake/Modules/FindLuaJIT.cmake 2020-06-22 14:30:11.028566796 +0200 @@ -9,7 +9,7 @@ FIND_PATH(LUA_INCLUDE_DIR luajit.h HINTS $ENV{LUA_DIR} - PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include luajit + PATH_SUFFIXES include/luajit-2.1 include/luajit-2.0 include/luajit-5_1-2.1 include/luajit-5_1-2.0 include/moonjit-2.2 include luajit PATHS ~/Library/Frameworks /Library/Frameworks
