[packages/openttd] - up to 14.0

[mrozowik]

commit 07029c795f61fa35030321bb727545f03ad0aab7
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date:   Sat Apr 20 15:58:33 2024 +0000

    - up to 14.0

 openttd-create-grf.patch | 17 +++++++++--------
 openttd.spec             | 11 ++++++-----
 2 files changed, 15 insertions(+), 13 deletions(-)
---
diff --git a/openttd.spec b/openttd.spec
index 9531cc2..92f71f7 100644
--- a/openttd.spec
+++ b/openttd.spec
@@ -1,12 +1,12 @@
 Summary:	An open source reimplementation of the Microprose game "Transport Tycoon Deluxe"
 Summary(pl.UTF-8):	Otwarta reimplementacja gry Transport Tycoon Deluxe
 Name:		openttd
-Version:	13.4
+Version:	14.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	https://cdn.openttd.org/openttd-releases/%{version}/%{name}-%{version}-source.tar.xz
-# Source0-md5:	ed42437a6f33e83b3e27f9ebd988efc4
+# Source0-md5:	f8244406ab5a1efcdf4fe8d173516a5a
 Source1:	%{name}.desktop
 Source2:	%{name}-server.desktop
 Patch0:		%{name}-create-grf.patch
@@ -117,10 +117,10 @@ install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{ai/library,scenario/heightmap}
 install dedicated/openttd-dedicated $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-install docs/openttd.6 $RPM_BUILD_ROOT%{_mandir}/man6
+%{__mv} docs/openttd.6 $RPM_BUILD_ROOT%{_mandir}/man6
 install media/openttd.256.png $RPM_BUILD_ROOT%{_pixmapsdir}/openttd.png
 
-%{__rm} $RPM_BUILD_ROOT%{_docdir}/{COPYING.md,README.md,changelog.txt,known-bugs.txt,multiplayer.md}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -133,7 +133,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING.md changelog.txt known-bugs.txt README.md docs/multiplayer.md
+#%doc CONTRIBUTING.md COPYING.md README.md changelog.txt known-bugs.txt docs/{*.md,*.html,*.svg,*png,*.txt}
+%doc CONTRIBUTING.md COPYING.md README.md changelog.txt known-bugs.txt docs
 %attr(755,root,root) %{_bindir}/%{name}
 %{_desktopdir}/%{name}.desktop
 %{_mandir}/man6/openttd.*
diff --git a/openttd-create-grf.patch b/openttd-create-grf.patch
index 0a13c86..0b1362f 100644
--- a/openttd-create-grf.patch
+++ b/openttd-create-grf.patch
@@ -1,6 +1,6 @@
---- openttd-1.11.2/cmake/scripts/CreateGRF.cmake~	2021-05-03 18:41:45.000000000 +0000
-+++ openttd-1.11.2/cmake/scripts/CreateGRF.cmake	2021-06-10 15:09:20.570503949 +0000
-@@ -39,20 +39,7 @@
+--- openttd-14.0/cmake/scripts/CreateGRF.cmake~	2024-04-13 12:55:23.000000000 +0000
++++ openttd-14.0/cmake/scripts/CreateGRF.cmake	2024-04-18 23:10:40.170610231 +0000
+@@ -45,21 +45,9 @@
      endif()
  endforeach()
  
@@ -11,15 +11,16 @@
 -    endif()
 -    message(FATAL_ERROR "NFORenum failed")
 -endif()
--
--execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT)
++execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo)
+ 
+-execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -g2 -p1 ${GRF_SOURCE_FOLDER_NAME}.grf RESULT_VARIABLE RESULT)
 -if(RESULT)
 -    if(NOT RESULT MATCHES "^[0-9]*$")
 -        message(FATAL_ERROR "Failed to run GRFCodec (${RESULT}), please check GRFCODEC_EXECUTABLE variable")
 -    endif()
 -    message(FATAL_ERROR "GRFCodec failed")
 -endif()
-+execute_process(COMMAND ${NFORENUM_EXECUTABLE} -s sprites/${GRF_SOURCE_FOLDER_NAME}.nfo)
-+execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -p1 ${GRF_SOURCE_FOLDER_NAME}.grf)
++execute_process(COMMAND ${GRFCODEC_EXECUTABLE} -n -s -e -g2 -p1 ${GRF_SOURCE_FOLDER_NAME}.grf)
  
- execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${GRF_SOURCE_FOLDER_NAME}.grf ${GRF_BINARY_FILE})
+ execute_process(COMMAND ${GRFID_EXECUTABLE} -m ${GRF_SOURCE_FOLDER_NAME}.grf OUTPUT_VARIABLE GRFID_HASH RESULT_VARIABLE RESULT)
+ if(RESULT)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openttd.git/commitdiff/07029c795f61fa35030321bb727545f03ad0aab7