From ab9d9e77380c94692e91fdde7e56672d356939b1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Oct 19 2015 18:15:53 +0000 Subject: Update to 0.9.1 (RHBZ #1208136) Signed-off-by: Igor Gnatenko --- diff --git a/.gitignore b/.gitignore index 4b06274..c7ba581 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ addon0.6.1-1.zip /supertuxkart-0.8-src.tar.bz2 /supertuxkart-0.8.1-src.tar.bz2 /supertuxkart-0.9-src.tar.xz +/stk-0.9.1-src.zip +/supertuxkart-0.9.1-src.tar.xz diff --git a/sources b/sources index 973bc45..84e2bbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ae07569ab02c88ca4d49017df7731923 supertuxkart-0.9-src.tar.xz +5d87d943f2e746043aed87dc80004701 supertuxkart-0.9.1-src.tar.xz diff --git a/supertuxkart-unbundle-angelscript.patch b/supertuxkart-unbundle-angelscript.patch deleted file mode 100644 index 99306e9..0000000 --- a/supertuxkart-unbundle-angelscript.patch +++ /dev/null @@ -1,77 +0,0 @@ -diff -uNr supertuxkart-0.9.orig/cmake/FindAngelscript.cmake supertuxkart-0.9/cmake/FindAngelscript.cmake ---- supertuxkart-0.9.orig/cmake/FindAngelscript.cmake 1970-01-01 03:00:00.000000000 +0300 -+++ supertuxkart-0.9/cmake/FindAngelscript.cmake 2015-05-18 17:04:56.631871672 +0300 -@@ -0,0 +1,34 @@ -+# - Try to find enet -+# Once done this will define -+# -+# ANGELSCRIPT_FOUND - system has enet -+# Angelscript_INCLUDE_DIRS - the enet include directory -+# Angelscript_LIBRARIES - the libraries needed to use enet -+# -+ -+FIND_PATH(Angelscript_INCLUDE_DIRS angelscript.h -+ PATHS -+ /usr/local -+ /usr -+ PATH_SUFFIXES include -+ ) -+ -+FIND_LIBRARY(Angelscript_LIBRARY -+ NAMES angelscript -+ PATHS -+ /usr/local -+ /usr -+ PATH_SUFFIXES lib -+ ) -+ -+# handle the QUIETLY and REQUIRED arguments and set ANGELSCRIPT_FOUND to TRUE if -+# all listed variables are TRUE -+INCLUDE(FindPackageHandleStandardArgs) -+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Angelscript DEFAULT_MSG Angelscript_LIBRARY Angelscript_INCLUDE_DIRS) -+ -+IF (ANGELSCRIPT_FOUND) -+ SET(Angelscript_LIBRARIES ${Angelscript_LIBRARY}) -+ENDIF (ANGELSCRIPT_FOUND) -+ -+MARK_AS_ADVANCED(Angelscript_LIBRARY Angelscript_LIBRARIES Angelscript_INCLUDE_DIRS) -+ -diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt ---- supertuxkart-0.9.orig/CMakeLists.txt 2015-05-14 12:28:55.707748866 +0300 -+++ supertuxkart-0.9/CMakeLists.txt 2015-05-18 17:04:56.631871672 +0300 -@@ -119,10 +119,9 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP") # Enable multi-processor compilation (faster) - endif() - -- --# Build the angelscript library --add_subdirectory("${PROJECT_SOURCE_DIR}/lib/angelscript/projects/cmake") --include_directories("${PROJECT_SOURCE_DIR}/lib/angelscript/include") -+# Angelscript -+find_package(Angelscript REQUIRED) -+include_directories(${Angelscript_INCLUDE_DIRS}) - - # OpenAL - if(APPLE) -@@ -309,7 +308,7 @@ - ${ENet_LIBRARIES} - glew - stkirrlicht -- angelscript -+ ${Angelscript_LIBRARIES} - ${CURL_LIBRARIES} - ${OGGVORBIS_LIBRARIES} - ${OPENAL_LIBRARY} -diff -uNr supertuxkart-0.9.orig/src/scriptengine/scriptarray.cpp supertuxkart-0.9/src/scriptengine/scriptarray.cpp ---- supertuxkart-0.9.orig/src/scriptengine/scriptarray.cpp 2015-04-21 14:32:22.244216774 +0300 -+++ supertuxkart-0.9/src/scriptengine/scriptarray.cpp 2015-05-18 17:06:44.849918355 +0300 -@@ -1496,7 +1496,8 @@ - continue; - - // The parameter must either be a reference to the subtype or a handle to the subtype -- int paramTypeId = func->GetParamTypeId(0, &flags); -+ int paramTypeId; -+ func->GetParam(0, ¶mTypeId, &flags, NULL, NULL); - - if( (paramTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) != (subTypeId & ~(asTYPEID_OBJHANDLE|asTYPEID_HANDLETOCONST)) ) - continue; diff --git a/supertuxkart-unbundle-enet.patch b/supertuxkart-unbundle-enet.patch index bb8eed6..9418f6c 100644 --- a/supertuxkart-unbundle-enet.patch +++ b/supertuxkart-unbundle-enet.patch @@ -1,6 +1,6 @@ -diff -uNr supertuxkart-0.9.orig/cmake/FindENet.cmake supertuxkart-0.9/cmake/FindENet.cmake ---- supertuxkart-0.9.orig/cmake/FindENet.cmake 1970-01-01 03:00:00.000000000 +0300 -+++ supertuxkart-0.9/cmake/FindENet.cmake 2015-04-23 12:40:36.636115363 +0300 +diff -uNr supertuxkart-0.9.1.wiiuse/cmake/FindENet.cmake supertuxkart-0.9.1/cmake/FindENet.cmake +--- supertuxkart-0.9.1.wiiuse/cmake/FindENet.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ supertuxkart-0.9.1/cmake/FindENet.cmake 2015-10-19 20:09:36.174150131 +0200 @@ -0,0 +1,49 @@ +# - Try to find enet +# Once done this will define @@ -51,10 +51,10 @@ diff -uNr supertuxkart-0.9.orig/cmake/FindENet.cmake supertuxkart-0.9/cmake/Find + +MARK_AS_ADVANCED(ENet_LIBRARY ENet_LIBRARIES ENet_INCLUDE_DIRS) + -diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt ---- supertuxkart-0.9.orig/CMakeLists.txt 2015-04-23 12:40:21.133663270 +0300 -+++ supertuxkart-0.9/CMakeLists.txt 2015-04-23 12:40:54.166626600 +0300 -@@ -61,8 +61,8 @@ +diff -uNr supertuxkart-0.9.1.wiiuse/CMakeLists.txt supertuxkart-0.9.1/CMakeLists.txt +--- supertuxkart-0.9.1.wiiuse/CMakeLists.txt 2015-10-19 20:08:21.035417630 +0200 ++++ supertuxkart-0.9.1/CMakeLists.txt 2015-10-19 20:09:36.177150839 +0200 +@@ -63,8 +63,8 @@ include_directories("${PROJECT_SOURCE_DIR}/lib/bullet/src") # Build the ENet UDP network library @@ -65,7 +65,7 @@ diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt # Build glew library add_subdirectory("${PROJECT_SOURCE_DIR}/lib/glew") -@@ -306,7 +306,7 @@ +@@ -330,7 +330,7 @@ bulletdynamics bulletcollision bulletmath @@ -73,4 +73,4 @@ diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt + ${ENet_LIBRARIES} glew stkirrlicht - angelscript + ${Angelscript_LIBRARIES} diff --git a/supertuxkart-unbundle-wiiuse.patch b/supertuxkart-unbundle-wiiuse.patch index a201fec..2a5661b 100644 --- a/supertuxkart-unbundle-wiiuse.patch +++ b/supertuxkart-unbundle-wiiuse.patch @@ -1,6 +1,6 @@ -diff -uNr supertuxkart-0.9.orig/cmake/FindWiiUse.cmake supertuxkart-0.9/cmake/FindWiiUse.cmake ---- supertuxkart-0.9.orig/cmake/FindWiiUse.cmake 1970-01-01 03:00:00.000000000 +0300 -+++ supertuxkart-0.9/cmake/FindWiiUse.cmake 2015-04-23 12:53:36.498155119 +0300 +diff -uNr supertuxkart-0.9.1.orig/cmake/FindWiiUse.cmake supertuxkart-0.9.1/cmake/FindWiiUse.cmake +--- supertuxkart-0.9.1.orig/cmake/FindWiiUse.cmake 1970-01-01 01:00:00.000000000 +0100 ++++ supertuxkart-0.9.1/cmake/FindWiiUse.cmake 2015-10-19 20:08:21.033417158 +0200 @@ -0,0 +1,99 @@ +# - try to find WiiUse library +# @@ -101,10 +101,10 @@ diff -uNr supertuxkart-0.9.orig/cmake/FindWiiUse.cmake supertuxkart-0.9/cmake/Fi +mark_as_advanced(WIIUSE_INCLUDE_DIR + WIIUSE_LIBRARY + WIIUSE_RUNTIME_LIBRARY) -diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt ---- supertuxkart-0.9.orig/CMakeLists.txt 2015-04-21 14:32:11.300162506 +0300 -+++ supertuxkart-0.9/CMakeLists.txt 2015-04-23 12:53:36.497155090 +0300 -@@ -104,10 +104,9 @@ +diff -uNr supertuxkart-0.9.1.orig/CMakeLists.txt supertuxkart-0.9.1/CMakeLists.txt +--- supertuxkart-0.9.1.orig/CMakeLists.txt 2015-10-18 23:03:49.223946803 +0200 ++++ supertuxkart-0.9.1/CMakeLists.txt 2015-10-19 20:08:21.035417630 +0200 +@@ -106,10 +106,9 @@ # (at least on VS) irrlicht will find wiiuse io.h file because # of the added include directory. if(USE_WIIUSE) @@ -117,7 +117,7 @@ diff -uNr supertuxkart-0.9.orig/CMakeLists.txt supertuxkart-0.9/CMakeLists.txt endif() # Set include paths -@@ -358,7 +357,7 @@ +@@ -382,7 +381,7 @@ target_link_libraries(supertuxkart ${PROJECT_SOURCE_DIR}/dependencies/lib/wiiuse.lib) endif() else() diff --git a/supertuxkart.spec b/supertuxkart.spec index 2cafd9b..91b70e6 100644 --- a/supertuxkart.spec +++ b/supertuxkart.spec @@ -1,6 +1,6 @@ Name: supertuxkart -Version: 0.9 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Kids 3D go-kart racing game featuring Tux Group: Amusements/Games License: GPLv2+ and GPLv3 and CC-BY-SA @@ -10,7 +10,6 @@ Source1: %{name}.6 Source2: supertuxkart-0.7.3-license-clarification.txt Patch0: supertuxkart-unbundle-wiiuse.patch Patch1: supertuxkart-unbundle-enet.patch -Patch2: supertuxkart-unbundle-angelscript.patch BuildRequires: cmake BuildRequires: libvorbis-devel freeglut-devel desktop-file-utils BuildRequires: openal-soft-devel freealut-devel >= 1.1.0-10 libtool @@ -49,7 +48,6 @@ This package contains the data files for SuperTuxKart. cp -p %{SOURCE2} . %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Delete bundled libs rm -rf lib/enet lib/wiiuse lib/angelscript #sed -i -e '/setAnimationStrength/s/^/\/\//' src/karts/kart_model.cpp @@ -104,6 +102,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*%{name}.desktop %{_datadir}/%{name} %changelog +* Sun Oct 18 2015 Igor Gnatenko - 0.9.1-1 +- Update to 0.9.1 (RHBZ #1208136) + * Fri Jun 19 2015 Fedora Release Engineering - 0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild