amigadave pushed to supertux (f21). "Update to 0.3.5"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon Apr 13 13:17:32 UTC 2015
>From 4344a19439590f9a8bf9d9529371582f5e543971 Mon Sep 17 00:00:00 2001
From: David King <amigadave at amigadave.com>
Date: Mon, 13 Apr 2015 10:25:42 +0100
Subject: Update to 0.3.5
diff --git a/.gitignore b/.gitignore
index a089550..793f022 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
supertux-0.3.3.tar.bz2
/supertux-0.3.4.tar.bz2
+/supertux-0.3.5.tar.bz2
diff --git a/sources b/sources
index 48044c9..4b32bf1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-108af4c1fd985e8842a15cd819b9b157 supertux-0.3.4.tar.bz2
+d691f03cd9b56c8841f164a9557add51 supertux-0.3.5.tar.bz2
diff --git a/supertux-0.3.4-appdata.patch b/supertux-0.3.4-appdata.patch
deleted file mode 100644
index 3892efb..0000000
--- a/supertux-0.3.4-appdata.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From b1b2c3c00fab1d4ac6af6e133b488b40e96ad877 Mon Sep 17 00:00:00 2001
-From: Benjamin Leduc <g.benjamin.leduc at gmail.com>
-Date: Fri, 26 Sep 2014 21:01:16 +0000
-Subject: [PATCH 1/2] addition of appdata
-
----
- CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f46bb2d..6010dae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -432,6 +432,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}
-
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})
-
-+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/supertux2.appdata.xml DESTINATION "share/appdata" )
-+
- INSTALL(DIRECTORY data/images
- data/fonts
- data/levels
---
-2.1.0
-
-
-From adab2a86eacda2c169b42f3a20149b798b883986 Mon Sep 17 00:00:00 2001
-From: Benjamin Leduc <g.benjamin.leduc at gmail.com>
-Date: Sat, 27 Sep 2014 11:48:02 +0000
-Subject: [PATCH 2/2] missing file
-
----
- supertux2.appdata.xml | 26 ++++++++++++++++++++++++++
- 1 file changed, 26 insertions(+)
- create mode 100644 supertux2.appdata.xml
-
-diff --git a/supertux2.appdata.xml b/supertux2.appdata.xml
-new file mode 100644
-index 0000000..fbed52e
---- /dev/null
-+++ b/supertux2.appdata.xml
-@@ -0,0 +1,26 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!-- Copyright 2014 William Moreno Reyes <williamjmorenor at fedoraproject.org> -->
-+
-+<!-- HOUSEKEEPING, REMOVE THIS COMMENT WHEN THIS GOES UPSTREAM
-+EmailAddress: supertux-devel at lists.lethargik.org
-+SentUpstream: 2014-09-25
-+-->
-+
-+<application>
-+ <id type="desktop">supertux2.desktop</id>
-+ <metadata_license>CC0-1.0</metadata_license>
-+ <summary> Run and jump game similar to Super Mario</summary>
-+ <description>
-+ <p>
-+ SuperTux is a 2D game very similar to Super Mario with Tux Penguin as
-+ protagonist, you must end each level by jumping and running to avoid
-+ obstacles and enemies.
-+ </p>
-+ </description>
-+ <url type="homepage">http://supertux.lethargik.org/</url>
-+ <screenshots>
-+ <screenshot type="default">http://supertux.lethargik.org/images/supertux-0.1.3-5.jpg</screenshot>
-+ <screenshot>http://supertux.lethargik.org/images/supertux-0.1.3-1.jpg</screenshot>
-+ <screenshot>http://supertux.lethargik.org/images/supertux-0.1.3-2.jpg</screenshot>
-+ </screenshots>
-+</application>
---
-2.1.0
-
diff --git a/supertux-0.3.4-system-squirrel.patch b/supertux-0.3.4-system-squirrel.patch
deleted file mode 100644
index 6c458d7..0000000
--- a/supertux-0.3.4-system-squirrel.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -urN supertux-0.3.4.old/CMakeLists.txt supertux-0.3.4/CMakeLists.txt
---- supertux-0.3.4.old/CMakeLists.txt 2013-07-09 00:03:39.000000000 +0100
-+++ supertux-0.3.4/CMakeLists.txt 2014-11-11 09:07:18.163568669 +0000
-@@ -148,19 +148,10 @@
-
- INCLUDE(ConfigureChecks)
-
--## Also execute instructions in external/squirrel/CMakeLists.txt
--
--ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
--
--## Add squirrel lib dir to search path
--
--LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
--
- ## Some additional include paths
-
- include_directories (${CMAKE_BINARY_DIR}/)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/)
--include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
- include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
-@@ -342,6 +333,7 @@
- ## Link supertux binary with squirrel and other libraries
-
- TARGET_LINK_LIBRARIES(supertux2 squirrel)
-+TARGET_LINK_LIBRARIES(supertux2 sqstdlib)
- TARGET_LINK_LIBRARIES(supertux2 ${SDL_LIBRARY})
- TARGET_LINK_LIBRARIES(supertux2 ${SDLIMAGE_LIBRARY})
- TARGET_LINK_LIBRARIES(supertux2 ${OPENAL_LIBRARY})
diff --git a/supertux-0.3.5-squirrel-printfunc.patch b/supertux-0.3.5-squirrel-printfunc.patch
new file mode 100644
index 0000000..7d353ae
--- /dev/null
+++ b/supertux-0.3.5-squirrel-printfunc.patch
@@ -0,0 +1,12 @@
+diff -urN supertux-0.3.5.old/src/scripting/scripting.cpp supertux-0.3.5/src/scripting/scripting.cpp
+--- supertux-0.3.5.old/src/scripting/scripting.cpp 2015-04-11 14:50:03.000000000 +0100
++++ supertux-0.3.5/src/scripting/scripting.cpp 2015-04-13 09:48:48.063689466 +0100
+@@ -99,7 +99,7 @@
+ sq_pop(global_vm, 1);
+
+ // register print function
+- sq_setprintfunc(global_vm, printfunc, printfunc);
++ sq_setprintfunc(global_vm, printfunc);
+ // register default error handlers
+ sqstd_seterrorhandlers(global_vm);
+
diff --git a/supertux-0.3.5-system-squirrel.patch b/supertux-0.3.5-system-squirrel.patch
new file mode 100644
index 0000000..3132d16
--- /dev/null
+++ b/supertux-0.3.5-system-squirrel.patch
@@ -0,0 +1,31 @@
+diff -urN supertux-0.3.5.old/CMakeLists.txt supertux-0.3.5/CMakeLists.txt
+--- supertux-0.3.5.old/CMakeLists.txt 2015-04-11 14:49:50.000000000 +0100
++++ supertux-0.3.5/CMakeLists.txt 2015-04-13 09:39:10.164704229 +0100
+@@ -161,19 +161,10 @@
+
+ INCLUDE(ConfigureChecks)
+
+-## Also execute instructions in external/squirrel/CMakeLists.txt
+-
+-ADD_SUBDIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
+-
+-## Add squirrel lib dir to search path
+-
+-LINK_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel)
+-
+ ## Some additional include paths
+
+ include_directories (${CMAKE_BINARY_DIR}/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/)
+-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/squirrel/include/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/tinygettext/include/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/findlocale/)
+ include_directories (${CMAKE_CURRENT_SOURCE_DIR}/external/obstack/)
+@@ -379,6 +370,7 @@
+ TARGET_LINK_LIBRARIES(supertux2 ${SDL2IMAGE_LIBRARIES})
+
+ TARGET_LINK_LIBRARIES(supertux2 squirrel)
++TARGET_LINK_LIBRARIES(supertux2 sqstdlib)
+ TARGET_LINK_LIBRARIES(supertux2 ${OPENAL_LIBRARY})
+ TARGET_LINK_LIBRARIES(supertux2 ${OGGVORBIS_LIBRARIES})
+ TARGET_LINK_LIBRARIES(supertux2 ${PHYSFS_LIBRARY})
diff --git a/supertux.spec b/supertux.spec
index f0b5a81..4ed1b7e 100644
--- a/supertux.spec
+++ b/supertux.spec
@@ -1,20 +1,23 @@
Name: supertux
-Version: 0.3.4
+Version: 0.3.5
Release: 1%{?dist}
Summary: Jump'n run like game
Group: Amusements/Games
License: GPLv2+
URL: http://supertux.lethargik.org/
-Source0: https://supertux.googlecode.com/files/%{name}-%{version}.tar.bz2
-Patch0: supertux-0.3.4-desktop.patch
-Patch1: supertux-0.3.4-system-squirrel.patch
+Source0: https://github.com/SuperTux/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.bz2
# Taken from upstream git.
-Patch2: supertux-0.3.4-appdata.patch
+# https://github.com/SuperTux/supertux/pull/63
+Source1: supertux2.appdata.xml
+Patch0: supertux-0.3.4-desktop.patch
+Patch1: supertux-0.3.5-system-squirrel.patch
+# Effectively a revert of upstream commit:
+# https://github.com/supertux/supertux/commit/bc25f6fa2616df7e905fed68ceb4e3ebc186a623
+Patch2: supertux-0.3.5-squirrel-printfunc.patch
-BuildRequires: SDL-devel >= 1.2.4
-BuildRequires: SDL_image-devel
-BuildRequires: SDL_mixer-devel
+BuildRequires: pkgconfig(sdl2) >= 2.0.1
+BuildRequires: pkgconfig(SDL2_image) >= 2.0.0
BuildRequires: zlib-devel
BuildRequires: desktop-file-utils
BuildRequires: libGLU-devel
@@ -42,7 +45,7 @@ Grabbing power-ups and other stuff on the way.
%setup -q
%patch0 -p1 -b .desktop
%patch1 -p1 -b .system-squirrel
-%patch2 -p1 -b .appdata
+%patch2 -p1 -b .squirrel-printfunc
%build
@@ -53,6 +56,8 @@ make VERBOSE=1 %{?_smp_mflags}
%install
+cp --archive %{SOURCE1} supertux2.appdata.xml
+
make install DESTDIR=%{buildroot}
rm -r %{buildroot}/usr/share/doc/supertux2
ln -snf opengl-game-wrapper.sh %{buildroot}%{_bindir}/supertux2-wrapper
@@ -85,7 +90,8 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
-%doc COPYING README WHATSNEW.txt
+%doc README.md WHATSNEW.txt
+%license LICENSE
%{_bindir}/supertux2*
%{_datadir}/supertux2
%{_datadir}/appdata/supertux2.appdata.xml
@@ -94,6 +100,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Mon Apr 13 2015 David King <amigadave at amigadave.com> - 0.3.5-1
+- Update to 0.3.5
+
* Tue Nov 11 2014 David King <amigadave at amigadave.com> - 0.3.4-1
- Update to 0.3.4 (#999396)
diff --git a/supertux2.appdata.xml b/supertux2.appdata.xml
new file mode 100644
index 0000000..246d77d
--- /dev/null
+++ b/supertux2.appdata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2014 William Moreno Reyes <williamjmorenor at fedoraproject.org> -->
+
+<application>
+ <id type="desktop">supertux2.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <summary> Run and jump game similar to Super Mario</summary>
+ <description>
+ <p>
+ SuperTux is a 2D game very similar to Super Mario with Tux Penguin as
+ protagonist, you must end each level by jumping and running to avoid
+ obstacles and enemies.
+ </p>
+ </description>
+ <url type="homepage">http://supertux.lethargik.org/</url>
+ <screenshots>
+ <screenshot type="default">http://supertux.lethargik.org/images/supertux-0.1.3-5.jpg</screenshot>
+ <screenshot>http://supertux.lethargik.org/images/supertux-0.1.3-1.jpg</screenshot>
+ <screenshot>http://supertux.lethargik.org/images/supertux-0.1.3-2.jpg</screenshot>
+ </screenshots>
+</application>
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/supertux.git/commit/?h=f21&id=4344a19439590f9a8bf9d9529371582f5e543971
More information about the scm-commits
mailing list