[packages/xmoto] - up to 0.6.1
mrozowik
mrozowik at pld-linux.org
Tue Nov 29 11:39:09 CET 2022
commit 4613024336a163139df03695d25db6e129d216bb
Author: Krzysztof Mrozowicz <mrozowik at pld-linux.org>
Date: Tue Nov 29 10:38:59 2022 +0000
- up to 0.6.1
xmoto-includes.patch | 21 ----------------
xmoto-lua51.patch | 35 ---------------------------
xmoto.spec | 68 +++++++++++++++++-----------------------------------
3 files changed, 22 insertions(+), 102 deletions(-)
---
diff --git a/xmoto.spec b/xmoto.spec
index 4e765b0..cdcb972 100644
--- a/xmoto.spec
+++ b/xmoto.spec
@@ -1,25 +1,22 @@
Summary: Clone of across/elma games
Summary(pl.UTF-8): Klon gry across/elma
Name: xmoto
-Version: 0.5.9
-Release: 6
+Version: 0.6.1
+Release: 1
License: GPL v2+
Group: X11/Applications/Games
-Source0: http://download.tuxfamily.org/xmoto/xmoto/%{version}/%{name}-%{version}-src.tar.gz
-# Source0-md5: d8d6b7a405139530650b8a9ae2ea6df3
+Source0: https://github.com/xmoto/xmoto/archive/%{version}/%{version}.tar.gz
+# Source0-md5: 88725490243e69d5ab5cde349fa5fa3a
Source1: %{name}.png
Source2: %{name}.desktop
-Patch0: %{name}-lua51.patch
-Patch1: %{name}-includes.patch
URL: http://xmoto.sourceforge.net/
BuildRequires: OpenGL-GLU-devel
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
BuildRequires: SDL_net-devel
BuildRequires: SDL_ttf-devel
-BuildRequires: autoconf
-BuildRequires: automake
BuildRequires: bzip2-devel
+BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: gettext-tools
BuildRequires: libjpeg-devel
@@ -27,7 +24,7 @@ BuildRequires: libpng-devel
BuildRequires: libtool
BuildRequires: libxdg-basedir-devel >= 1.1.1-2
BuildRequires: lua51-devel
-BuildRequires: ode-devel >= 1:0.11
+BuildRequires: ode-devel >= 1:0.16
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel
@@ -53,58 +50,37 @@ wynikami, swoimi i innych, w wyścigu z czasem.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-
-# fix some translations
-%{__sed} -i -e 's/lv_LV/lv/g;s/da_DK/da/g;s/gl_ES/gl/g;s/pt_PT/pt/g;s/tr_TR/tr/g' configure.in
-mv -f po/lv{_LV,}.po
-mv -f po/da{_DK,}.po
-mv -f po/gl{_ES,}.po
-mv -f po/pt{_PT,}.po
-mv -f po/tr{_TR,}.po
# don't run svnversion
touch src/svnVersion
%build
-%{__libtoolize}
-%{__gettextize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__automake}
+mkdir build
+cd build
+%cmake .. \
+ -DOpenGL_GL_PREFERENCE=GLVND
-%configure
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
+cd build
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+cd ..
-install %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_pixmapsdir}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/ca{_ES,}
-# identical to ca_ES
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/ca_{AD,FR,IT}*
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/cs{_CZ,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/de{_DE,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/es{_ES,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/fi{_FI,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/fr{_FR,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/hu{_HU,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/it{_IT,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/lt{_LT,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/nb{_NO,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/nl{_NL,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/nn{_NO,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/pl{_PL,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/ru{_RU,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sk{_SK,}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sv{_SE,}
+mv -f $RPM_BUILD_ROOT%{_localedir}/ca{_ES,}
+mv -f $RPM_BUILD_ROOT%{_localedir}/cs{_CZ,}
+mv -f $RPM_BUILD_ROOT%{_localedir}/da{_DK,}
+mv -f $RPM_BUILD_ROOT%{_localedir}/gl{_ES,}
+mv -f $RPM_BUILD_ROOT%{_localedir}/nb{_NO,}
+mv -f $RPM_BUILD_ROOT%{_localedir}/nn{_NO,}
+mv -f $RPM_BUILD_ROOT%{_localedir}/sv{_SE,}
%find_lang %{name}
@@ -113,7 +89,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc ChangeLog README TODO
+%doc ChangeLog README.md
%attr(755,root,root) %{_bindir}/*
%{_datadir}/xmoto
%{_pixmapsdir}/*
diff --git a/xmoto-includes.patch b/xmoto-includes.patch
deleted file mode 100644
index cd62a76..0000000
--- a/xmoto-includes.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xmoto-0.5.9/src/image/tim_png.cpp~ 2011-10-11 22:18:11.000000000 +0200
-+++ xmoto-0.5.9/src/image/tim_png.cpp 2012-02-08 13:34:49.001077897 +0100
-@@ -24,6 +24,7 @@
- */
- #include <stdio.h>
- #include <string.h>
-+#include <zlib.h>
- #include "tim.h"
- #include "png.h"
-
---- xmoto-0.5.9/src/helpers/System.cpp~ 2011-10-11 22:18:14.000000000 +0200
-+++ xmoto-0.5.9/src/helpers/System.cpp 2013-11-03 21:31:03.283105603 +0100
-@@ -24,6 +24,8 @@
- #include "Log.h"
- #include "VExcept.h"
- #include <sstream>
-+#include <sys/types.h>
-+#include <unistd.h>
-
- std::vector<std::string>* System::getDisplayModes(int windowed) {
- std::vector<std::string>* modes = new std::vector<std::string>;
diff --git a/xmoto-lua51.patch b/xmoto-lua51.patch
deleted file mode 100644
index e82cc2c..0000000
--- a/xmoto-lua51.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Original lua-detection-code is broken:
-* xmoto builds with lua50
-* xmoto doesn't build with lua51 (configure: error: liblua5.1)
-* xmoto doesn't build with installed both lua50 and lua51 (undefined reference to `luaL_newstate')
---- xmoto-0.3.4/configure.in.orig 2007-12-25 09:59:05.569939403 +0100
-+++ xmoto-0.3.4/configure.in 2007-12-25 10:02:46.536229609 +0100
-@@ -77,23 +77,11 @@
- fi
- AM_CONDITIONAL([USE_SDLGFX], test "$USE_SDLGFX" = "1")
-
--AC_SEARCH_LIBS(lua_pushboolean,lua lua5.1 lua50, [], [AC_MSG_ERROR(liblua5.1, liblua50, or liblua required)])
--AC_SEARCH_LIBS(luaopen_math,lualib lualib5.1 lualib50, [], [AC_MSG_ERROR(liblualib5.1, liblualib50, or liblualib required)])
--
--dnl ***** Check lua headers, as they are prone to be located random places on random systems! *****
--dnl The following three lines where suggested by Eric Piel, but they don't seem to work on my system
--dnl AC_CHECK_HEADERS(lua.h lua/lua.h lua50/lua.h, [break], [AC_MSG_ERROR(Could not find lua.h)])
--dnl AC_CHECK_HEADERS(lauxlib.h lua/lauxlib.h lua50/lauxlib.h, [break], [AC_MSG_ERROR(Could not find luaxlib.h)])
--dnl AC_CHECK_HEADERS(lualib.h lua/lualib.h lua50/lualib.h, [break], [AC_MSG_ERROR(Could not find lualib.h)])
--
--dnl search in this order to put in USE_LUA_VERSION the recenter version
--dnl in .h inclusion, order is reversed to include the recenter version
--USE_LUA_VERSION="unknown"
--AC_CHECK_HEADER(lua.h, AC_DEFINE(HAVE_LUA_H) [USE_LUA_VERSION="unknown"])
--AC_CHECK_HEADER(lua/lua.h, AC_DEFINE(HAVE_LUA_LUA_H) [USE_LUA_VERSION="unknown"])
--AC_CHECK_HEADER(lua50/lua.h, AC_DEFINE(HAVE_LUA50_LUA_H) [USE_LUA_VERSION="5.0"])
--AC_CHECK_HEADER(lua51/lua.h, AC_DEFINE(HAVE_LUA51_LUA_H) [USE_LUA_VERSION="5.1"])
--AC_CHECK_HEADER(lua5.1/lua.h, AC_DEFINE(HAVE_LUA5_1_LUA_H)[USE_LUA_VERSION="5.1"])
-+PKG_CHECK_MODULES(LUA, lua51)
-+CXXFLAGS="$CXXFLAGS $LUA_CFLAGS"
-+LIBS="$LIBS $LUA_LIBS"
-+USE_LUA_VERSION=5.1
-+AC_DEFINE(HAVE_LUA_H)
-
- AC_LANG_PUSH([C++])
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmoto.git/commitdiff/4613024336a163139df03695d25db6e129d216bb
More information about the pld-cvs-commit
mailing list