rpms / minetest

Clone
Source Code
GIT

#6 Update to 5.3.0 and -data subpackages
Merged 3 years ago by ohaessler. Opened 3 years ago by bookwar.
rpms/ bookwar/minetest 5.3.0  into  master

Update to 5.3.0 and -data subpackages
Aleksandra Fedorova • 3 years ago  
b38d5d5
file modified
+2 
@@ -30,3 +30,5 @@ 
 

  /minetest_game-5.1.0.tar.gz
 

  /minetest-5.2.0.tar.gz
 

  /minetest_game-5.2.0.tar.gz
 

+ /minetest-5.3.0.tar.gz
 

+ /minetest_game-5.3.0.tar.gz

file removed
-62 
@@ -1,62 +0,0 @@ 
 

- From 1b5a6fdbe6a1c9696ec85a9c774a1aea8ccf1672 Mon Sep 17 00:00:00 2001
 

- From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
 

- Date: Tue, 27 Dec 2016 15:23:09 +0100
 

- Subject: [PATCH] use pkg-config to find luajit
 

- 

- Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
 

- ---
 

-  cmake/Modules/FindLuaJIT.cmake | 38 +++++---------------------------------
 

-  1 file changed, 5 insertions(+), 33 deletions(-)
 

- 

- diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake
 

- index e4335d83..f62fe8ac 100644
 

- --- a/cmake/Modules/FindLuaJIT.cmake
 

- +++ b/cmake/Modules/FindLuaJIT.cmake
 

- @@ -6,39 +6,11 @@
 

-  #
 

-  # This module is similar to FindLua51.cmake except that it finds LuaJit instead.
 

-  

- -FIND_PATH(LUA_INCLUDE_DIR luajit.h
 

- -	HINTS
 

- -	$ENV{LUA_DIR}
 

- -	PATH_SUFFIXES include/luajit-2.0 include/luajit-5_1-2.0 include
 

- -	PATHS
 

- -	~/Library/Frameworks
 

- -	/Library/Frameworks
 

- -	/sw # Fink
 

- -	/opt/local # DarwinPorts
 

- -	/opt/csw # Blastwave
 

- -	/opt
 

- -)
 

- -
 

- -FIND_LIBRARY(LUA_LIBRARY
 

- -	NAMES luajit-5.1
 

- -	HINTS
 

- -	$ENV{LUA_DIR}
 

- -	PATH_SUFFIXES lib64 lib
 

- -	PATHS
 

- -	~/Library/Frameworks
 

- -	/Library/Frameworks
 

- -	/sw
 

- -	/opt/local
 

- -	/opt/csw
 

- -	/opt
 

- -)
 

- -
 

- -IF(LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/luajit.h")
 

- -	FILE(STRINGS "${LUA_INCLUDE_DIR}/luajit.h" lua_version_str REGEX "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT .+\"")
 

- -
 

- -	STRING(REGEX REPLACE "^#define[ \t]+LUA_RELEASE[ \t]+\"LuaJIT ([^\"]+)\".*" "\\1" LUA_VERSION_STRING "${lua_version_str}")
 

- -	UNSET(lua_version_str)
 

- -ENDIF()
 

- +find_package (PkgConfig REQUIRED)
 

- +pkg_check_modules (LuaJIT QUIET REQUIRED luajit)
 

- +set (LUA_LIBRARY ${LuaJIT_LIBRARIES})
 

- +set (LUA_INCLUDE_DIR ${LuaJIT_INCLUDE_DIRS})
 

- +set (LUA_VERSION_STRING ${LuaJIT_VERSION})
 

-  

-  INCLUDE(FindPackageHandleStandardArgs)
 

-  # handle the QUIETLY and REQUIRED arguments and set LUAJIT_FOUND to TRUE if
 

- -- 

- 2.11.0
 

-

file modified
+21 -12 
@@ -1,4 +1,10 @@ 
 

- == How to start ==
 

+ == For desktop ==
 

+ 

+ Install via:
 

+ 

+     dnf install minetest
 

+ 

+ You will get client, server and the game data.
 

  

  To run the game use the command 'minetest' or choose Minetest from
 

  applications menu.
 
@@ -11,19 +17,25 @@ 
 

  To connect to the existing Minetest server specify the server name (or
 

  IP) and port number. Server name might be 'localhost' as well.
 

  

- Check the Wiki for gameplay details:
 

- http://c55.me/minetest/wiki/doku.php?id=crafting
 

+ See https://minetest.net for more details.
 

+ 

+ == For server ==
 

+ 

+ Install via:
 

  

- Available public servers:
 

- http://c55.me/minetest/wiki/doku.php?id=public_servers
 

+     dnf install minetest-server
 

  

- == Minetest server ==
 

+ You can optionally install minetest game via:
 

+ 

+     dnf install minetest-data-game
 

  

  To run the system-wide Minetest server use the command
 

- # systemctl start minetest.service
 

+ 

+     systemctl start minetest.service
 

  

  To make Minetest server run on boot use
 

- # systemctl enable minetest.service 

+ 

+     systemctl enable minetest.service
 

  

  Minetest server uses configuration file /etc/minetest.conf. It listens
 

  to the port 30000 and stores the data in /var/lib/minetest. This can
 
@@ -32,7 +44,4 @@ 
 

  Minetest-server also provides the rsyslog configuration file. You need
 

  to restart the rsyslog daemon after minetest installation for this
 

  file to take effect. After rsyslog restart minetest logs will be put
 

- in /var/log/minetest.log
 

- 

- Check the project Wiki for server commands and privilege system 

- http://c55.me/minetest/wiki/doku.php?id=server_commands
 

+ in /var/log/minetest.log 

\ No newline at end of file

file modified
+44 -12 
@@ -1,6 +1,6 @@ 
 

  Name:     minetest
 

- Version:  5.2.0
 

- Release:  2%{?dist}
 

+ Version:  5.3.0
 

+ Release:  1%{?dist}
 

  Summary:  Multiplayer infinite-world block sandbox with survival mode
 

  

  License:  LGPLv2+ and CC-BY-SA
 
@@ -27,7 +27,7 @@ 
 

  BuildRequires:  gcc-c++
 

  BuildRequires:  cmake >= 2.6.0
 

  BuildRequires:  irrlicht-devel
 

- BuildRequires:  bzip2-devel gettext-devel sqlite-devel
 

+ BuildRequires:  bzip2-devel gettext-devel sqlite-devel zlib-devel
 

  BuildRequires:  libpng-devel libjpeg-turbo-devel libXxf86vm mesa-libGL-devel
 

  BuildRequires:  desktop-file-utils
 

  BuildRequires:  systemd
 
@@ -38,16 +38,17 @@ 
 

  BuildRequires:  luajit-devel
 

  BuildRequires:  leveldb-devel
 

  BuildRequires:  gmp-devel
 

- BuildRequires:	libappstream-glib
 

+ BuildRequires:  libappstream-glib
 

  BuildRequires:  freetype-devel
 

  

  Requires:       %{name}-server = %{version}-%{release}
 

+ Requires:       %{name}-data-game = %{version}-%{release}
 

  Requires:       hicolor-icon-theme
 

  

- %description 

- Game of mining, crafting and building in the infinite world of cubic
 

- blocks with optional hostile creatures, features both single and the
 

- network multiplayer mode. There are no in-game sounds yet
 

+ %description
 

+ Game of mining, crafting and building in the infinite world of cubic blocks with
 

+ optional hostile creatures, features both single and the network multiplayer
 

+ mode, mods. Public multiplayer servers are available.
 

  

  %package server
 

  Summary:  Minetest multiplayer server
 
@@ -56,16 +57,32 @@ 
 

  Requires(post):   systemd
 

  Requires(preun):  systemd
 

  Requires(postun): systemd
 

+ Requires:         %{name}-data-common = %{version}-%{release}
 

+ Recommends:       %{name}-data-game = %{version}-%{release}
 

  

  %description server
 

- Minetest multiplayer server. This package does not require X Window System
 

+ Minetest multiplayer server. This package does not require X Window System.
 

+ 

+ %package data-common
 

+ Summary:  Minetest common data between client and server
 

+ 

+ %description data-common
 

+ Minetest common data. This package is shared between minetest server and client.
 

+ 

+ %package data-game
 

+ Summary:  Minetest default and minimal game data
 

+ Requires: %{name}-data-common = %{version}-%{release}
 

+ 

+ %description data-game
 

+ Minetest default game data. This package is optional for a server if you install
 

+ your own game.
 

  

  %prep
 

  %autosetup -p1
 

  

  pushd games
 

  tar xf %{SOURCE6}
 

- mv %{name}_game-5.2.0 %{name}_game
 

+ mv %{name}_game-%{version} %{name}_game
 

  popd
 

  

  cp %{SOURCE7} doc/
 
@@ -150,13 +167,15 @@ 
 

  %systemd_preun %{name}@default.service
 

  

  %postun server
 

- %systemd_postun_with_restart %{name}@default.service 

+ %systemd_postun_with_restart %{name}@default.service
 

  

  %files -f %{name}.lang
 

  %license doc/lgpl-2.1.txt
 

  %doc README.fedora
 

  %{_bindir}/%{name}
 

- %{_datadir}/%{name}/
 

+ %{_datadir}/%{name}/client
 

+ %{_datadir}/%{name}/fonts
 

+ %{_datadir}/%{name}/textures
 

  %{_datadir}/applications/%{name}.desktop
 

  %exclude %{_datadir}/applications/net.%{name}.%{name}.desktop
 

  %{_datadir}/icons/hicolor/*/apps/%{name}.png
 
@@ -176,7 +195,20 @@ 
 

  %attr(-,minetest,minetest)%{_sysconfdir}/sysconfig/%{name}/
 

  %{_mandir}/man6/%{name}server.*
 

  

+ %files data-common
 

+ %license doc/lgpl-2.1.txt
 

+ %{_datadir}/%{name}/builtin
 

+ 

+ %files data-game
 

+ %license doc/lgpl-2.1.txt
 

+ %{_datadir}/%{name}/games
 

+ 

+ 

  %changelog
 

+ * Sun Jul 26 2020 Aleksandra Fedorova <alpha@bookwar.info> - 5.3.0-1
 

+ - Update to new upstream version 5.3.0
 

+ - Add -data subpackages (patch by Olivier Samyn)
 

+ 

  * Sat May 30 2020 Björn Esser <besser82@fedoraproject.org> - 5.2.0-2
 

  - Rebuild (jsoncpp)

file modified
+2 -2 
@@ -1,2 +1,2 @@ 
 

- SHA512 (minetest-5.2.0.tar.gz) = 47e3cdf488d50ea61659ac3b72960c9971270d1a793e0d79dcb649c89f7a6e65a16c21e1b903d08c916a2ebcbd3fd2164ec67173a3d4f2a2e9bb3a6351b48851
 

- SHA512 (minetest_game-5.2.0.tar.gz) = 316d52fbd72f87a32ea56f51ae4d4da168dbe597f3687b37b708920e51dc53f863741904f8c2339609aee6d226daf3b8918adafc292ff6d242838312d7891cc1
 

+ SHA512 (minetest-5.3.0.tar.gz) = 7bb34a80107861539a9ac2417812625ef11d145bf9401afdb8e0a1b9f619adcce24e2becf5bf361b805f4610097cf9d44c76d497ab08d489a43655852ce44777
 

+ SHA512 (minetest_game-5.3.0.tar.gz) = 986e9ca436159b115a8d2a07c4d863e0f5b90343447864e737bfd93bdc75a6d4b9d97b9dc90486858dda69e9a76ffdf79186e163d55978196e8cb98091ff97e6

Updated to new upstream version.

New -data subpackages allow server installation with
game data but without graphical environment.

Update README to describe current setup.

Pull-Request has been merged by ohaessler
3 years ago
Changes Summary 5
+2 -0
file changed
.gitignore
-62
file removed
0001-use-pkg-config-to-find-luajit.patch
+21 -12
file changed
minetest.README
+44 -12
file changed
minetest.spec
+2 -2
file changed
sources
Powered by Pagure 5.14.1
Documentation • File an Issue • About this Instance • SSH Hostkey/Fingerprint
© Red Hat, Inc. and others.