rpms/spring/F-11 spring-0.79.1.2-allegro.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 spring.spec, 1.2, 1.3 spring-0.72.2.1-nodedicated.patch, 1.1, NONE spring-0.78.2.1-allegro.patch, 1.1, NONE

Sat Jul 18 21:40:54 UTC 2009

Author: abompard

Update of /cvs/pkgs/rpms/spring/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30265/F-11

Modified Files:
	.cvsignore sources spring.spec 
Added Files:
	spring-0.79.1.2-allegro.patch 
Removed Files:
	spring-0.72.2.1-nodedicated.patch 
	spring-0.78.2.1-allegro.patch 
Log Message:
* Sat Jul 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.79.1.2-1
- version 0.79.1.2
- remove obsolete fonts hack
- build dedicated server


spring-0.79.1.2-allegro.patch:
 ./rts/build/cmake/FindAllegro.cmake |   61 ++++++++++++++++++++++++++++++++++++
 rts/CMakeLists.txt                  |    3 +
 2 files changed, 63 insertions(+), 1 deletion(-)

--- NEW FILE spring-0.79.1.2-allegro.patch ---
diff -up ./rts/build/cmake/FindAllegro.cmake.allegro ./rts/build/cmake/FindAllegro.cmake
--- ./rts/build/cmake/FindAllegro.cmake.allegro	2009-02-02 16:19:04.000000000 +0100
+++ ./rts/build/cmake/FindAllegro.cmake	2009-02-02 16:19:04.000000000 +0100
@@ -0,0 +1,61 @@
+# http://guichan.googlecode.com/svn/trunk/CMake/Modules/FindAllegro.cmake
+# - Try to find Allegro
+# Once done this will define
+#
+#  ALLEGRO_FOUND - system has Allegro
+#  ALLEGRO_INCLUDE_DIRS - the Allegro include directory
+#  ALLEGRO_LIBRARIES - Link these to use Allegro
+#  ALLEGRO_DEFINITIONS - Compiler switches required for using Allegro
+#
+#  Copyright (c) 2008 Olof Naessen <olof.naessen at gmail.com>
+#
+#  Redistribution and use is allowed according to the terms of the New
+#  BSD license.
+#  For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+#
+
+
+if (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+  # in cache already
+  set(ALLEGRO_FOUND TRUE)
+else (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+  find_program(ALLEGROCONFIG_EXECUTABLE NAMES allegro-config PATHS
+     /opt/local/bin
+  )
+
+  #reset vars
+  set(ALLEGRO_LIBRARIES)
+  set(ALLEGRO_INCLUDE_DIRS)
+
+  # if allegro-config has been found
+  if(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_LIBRARIES)
+    exec_program(${ALLEGROCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE ALLEGRO_INCLUDE_DIRS)
+
+    if(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+      set(ALLEGRO_FOUND TRUE)
+    endif(ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
+    set( ALLEGRO_LIBRARIES ${ALLEGRO_LIBRARIES} CACHE STRING "The libraries for allegro" )
+
+    mark_as_advanced(ALLEGRO_LIBRARIES ALLEGRO_INCLUDE_DIRS)
+
+  endif(ALLEGROCONFIG_EXECUTABLE AND NOT MINGW)
+
+  if (ALLEGRO_FOUND)
+    if (NOT Allegro_FIND_QUIETLY)
+      message(STATUS "Found Allegro: ${ALLEGRO_LIBRARIES}")
+    endif (NOT Allegro_FIND_QUIETLY)
+  else (ALLEGRO_FOUND)
+    if (Allegro_FIND_REQUIRED)
+      message(FATAL_ERROR "Could not find Allegro")
+    endif (Allegro_FIND_REQUIRED)
+  endif (ALLEGRO_FOUND)
+
+  # show the ALLEGRO_INCLUDE_DIRS and ALLEGRO_LIBRARIES variables only in the advanced view
+  mark_as_advanced(ALLEGRO_INCLUDE_DIRS ALLEGRO_LIBRARIES)
+
+endif (ALLEGRO_LIBRARIES AND ALLEGRO_INCLUDE_DIRS)
+
diff -up ./rts/CMakeLists.txt.allegro ./rts/CMakeLists.txt
--- rts/CMakeLists.txt.allegro	2009-06-23 20:30:22.000000000 +0200
+++ rts/CMakeLists.txt	2009-07-18 23:25:29.000000000 +0200
@@ -56,7 +56,8 @@
 FIND_PACKAGE(GLU REQUIRED)
 FIND_PACKAGE(GLUT REQUIRED)
 FIND_PACKAGE(GLEW REQUIRED)
-LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_LIBRARIES})
+FIND_PACKAGE(Allegro REQUIRED)
+LIST(APPEND spring_libraries ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${GLEW_LIBRARIES} ${DEVIL_LIBRARIES} ${ALLEGRO_LIBRARIES})
 
 FIND_PACKAGE(Freetype REQUIRED)
 INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	18 Mar 2009 06:26:26 -0000	1.2
+++ .cvsignore	18 Jul 2009 21:40:24 -0000	1.3
@@ -1 +1 @@
-spring_0.78.2.1_src.tar.lzma
+spring_0.79.1.2_src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	18 Mar 2009 06:26:27 -0000	1.2
+++ sources	18 Jul 2009 21:40:24 -0000	1.3
@@ -1 +1 @@
-4765d25d44f4bdc2f68af0f76743f30d  spring_0.78.2.1_src.tar.lzma
+408b0359a43ae2a34798a6f41fe6f82a  spring_0.79.1.2_src.tar.gz


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-11/spring.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- spring.spec	22 Mar 2009 11:59:26 -0000	1.2
+++ spring.spec	18 Jul 2009 21:40:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           spring
-Version:        0.78.2.1
-Release:        9%{?dist}
+Version:        0.79.1.2
+Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
 Group:          Amusements/Games
@@ -12,14 +12,12 @@ Group:          Amusements/Games
 #   installer/builddata/bitmaps/README.txt.
 License:        GPLv2+ and GPLv3+ and LGPLv2 and GFDL and (GFDL or CC-BY)
 
-URL:            http://spring.clan-sy.com
-Source0:        http://spring.clan-sy.com/dl/spring_%{version}_src.tar.lzma
+URL:            http://springrts.com
+Source0:        http://springrts.com/dl/spring_%{version}_src.tar.gz
 Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
-Patch0:         spring-0.78.2.1-allegro.patch
-# Don't build the dedicated server (in development)
-Patch1:         spring-0.72.2.1-nodedicated.patch
+Patch0:         spring-0.79.1.2-allegro.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,14 +26,11 @@ BuildRequires:  glew-devel libvorbis-dev
 BuildRequires:  freetype-devel python-devel allegro-devel zip
 BuildRequires:  desktop-file-utils
 
-%if 0%{?fedora} <= 10
-Requires:       dejavu-fonts
-%else
-Requires:       dejavu-sans-fonts
-%endif
-
 Requires:       spring-lobby spring-installer spring-maps-default
 
+# TODO: split the package
+Provides:       spring-dedicated = %{version}-%{release}
+
 # Spring is not supposed to run on Linux/PPC. Noone in the dev team has the
 # hardware to test it. Currently, it does not even build. Here's a thread in
 # the forums about this issue:
@@ -59,7 +54,6 @@ great resource, read it here: http://spr
 cp -p %{SOURCE1} README.Fedora
 touch ./rts/build/cmake/FindAllegro.cmake
 %patch0 -p0 -b .allegro
-%patch1 -p0 -b .nodedicated
 chmod -x rts/lib/7zip/*
 
 
@@ -98,11 +92,6 @@ desktop-file-install  \
         --delete-original \
         $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
-# Use system fonts
-rm $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/{Luxi,Vera}.ttf
-ln -s ../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/Vera.ttf
-ln -s ../../fonts/dejavu/DejaVuSans.ttf $RPM_BUILD_ROOT%{_datadir}/%{name}/fonts/Luxi.ttf
-
 
 %post
 # Icons
@@ -136,6 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.html README.Fedora Documentation/*
 %{_bindir}/*
 %{_libdir}/libunitsync.so
+%{_libdir}/libspringserver.so
 %{_libdir}/%{name}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/48x48/*/*.png
@@ -144,6 +134,15 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.79.1.2-1
+- version 0.79.1.2
+- remove obsolete fonts hack
+- build dedicated server
+
+* Sat May 23 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.79.0.2-1
+- version 0.79.0.2
+- update URL
+
 * Sun Mar 22 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-9
 - exclude KAI, since it's deprecated
   (http://spring.clan-sy.com/phpbb/viewtopic.php?f=20&t=18196)


--- spring-0.72.2.1-nodedicated.patch DELETED ---


--- spring-0.78.2.1-allegro.patch DELETED ---


