rpms/spring/F-10 spring-0.72.2.1-nodedicated.patch, NONE, 1.1 spring-0.78.2.1-allegro.patch, NONE, 1.1 spring-README.Fedora, NONE, 1.1 spring.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Wed Mar 18 06:30:56 UTC 2009

Author: abompard

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

Modified Files:
	.cvsignore sources 
Added Files:
	spring-0.72.2.1-nodedicated.patch 
	spring-0.78.2.1-allegro.patch spring-README.Fedora spring.spec 
Log Message:
initial commit for branch F-10

spring-0.72.2.1-nodedicated.patch:

--- NEW FILE spring-0.72.2.1-nodedicated.patch ---
diff -up ./CMakeLists.txt.nodedicated ./CMakeLists.txt
--- ./CMakeLists.txt.nodedicated	2009-02-02 23:49:14.000000000 +0100
+++ ./CMakeLists.txt	2009-02-02 23:49:20.000000000 +0100
@@ -124,7 +124,7 @@ endif (NOT MINGW)
 ### Where the other CMakeLists.txt are
 Add_Subdirectory(rts)
 Add_Subdirectory(AI)
-Add_Subdirectory(tools/DedicatedServer)
+#Add_Subdirectory(tools/DedicatedServer)
 Add_Subdirectory(tools/unitsync)
 #Add_Subdirectory(tools/DemoAnalyser)
 #Add_Subdirectory(tools/DemoDumper)

spring-0.78.2.1-allegro.patch:

--- NEW FILE spring-0.78.2.1-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-01-18 15:44:42.000000000 +0100
+++ ./rts/CMakeLists.txt	2009-02-02 16:21:38.000000000 +0100
@@ -41,10 +41,11 @@ ELSE (MINGW)
 	FIND_PACKAGE(GLUT REQUIRED)
 	FIND_PACKAGE(GLEW REQUIRED)
 	FIND_PACKAGE(OggVorbis REQUIRED)
+	FIND_PACKAGE(Allegro REQUIRED)
 
 	FIND_PACKAGE(Freetype REQUIRED)
 	INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIR})
-	LIST(APPEND spring_libraries ${OPENAL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${X11_X11_LIB} ${X11_Xcursor_LIB} ${GLEW_LIBRARIES})
+	LIST(APPEND spring_libraries ${OPENAL_LIBRARY} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${X11_X11_LIB} ${X11_Xcursor_LIB} ${GLEW_LIBRARIES} ${ALLEGRO_LIBRARIES})
 ENDIF (MINGW)
 
 ### libraries needed on all platforms


--- NEW FILE spring-README.Fedora ---
Readme for Spring
=================

Games are played using one of a number of mods. This package will not bring any
mod, but if you install the spring-installer package, you'll be able to
download some mods and click on the files to install them.
The same goes for maps, just download and click on them.

The places to download maps and mods are referenced on the Spring wiki:
http://spring.clan-sy.com/wiki/Main_Page

An installer for the "Complete Anihilation" mod is provided in the ca-installer
package. Some defaults maps should already be installed (they come from the
spring-maps-default package).


--- NEW FILE spring.spec ---
Name:           spring
Version:        0.78.2.1
Release:        8%{?dist}
Summary:        Multiplayer, 3D realtime strategy combat game

Group:          Amusements/Games
# Few notes about licensing:
# The main game is GPLv2+
# - AI/Global/RAI/README says that AI is licensed under GPLv3+
# - License for some sounds is LGPLv2 as taken from bzflag.
# - License for some graphics is GFDL and (GFDL or CC-BY). See
#   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
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

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake SDL-devel openal-devel boost-devel DevIL-devel
BuildRequires:  glew-devel libvorbis-devel java-devel DevIL-ILUT-devel
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

# 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:
# http://spring.clan-sy.com/phpbb/viewtopic.php?f=20&t=6234
ExcludeArch:    ppc ppc64


%description
Spring is a project aiming to create a new, versatile, full 3D Real Time
Strategy Engine.

Spring is designed to be played as online multiplayer matches, but some AI are
also available to play against the computer.

Please read the README.Fedora file to get started. The Spring wiki is also a
great resource, read it here: http://spring.clan-sy.com/wiki/Main_Page


%prep
%setup -q -n %{name}_%{version}
cp -p %{SOURCE1} README.Fedora
touch ./rts/build/cmake/FindAllegro.cmake
%patch0 -p0 -b .allegro
%patch1 -p0 -b .nodedicated
chmod -x rts/lib/7zip/*


%build
%cmake -DDATADIR:PATH=share/%{name} \
       -DLIBDIR:PATH=%{_lib} \
       .
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

# Prepare maps and mods dirs
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/{maps,mods}

# Move icons into proper Freedesktop hicolor theme
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes/
mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/application-x-spring-demo.png \
         $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/mimetypes/

# Fix Icon entry
sed -i -e 's/^Icon=\(.*\).png/Icon=\1/g' \
        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
desktop-file-install  \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications \
        --remove-category Application \
        --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
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# MimeType entry in the desktop file
update-desktop-database &> /dev/null || :
# MIME package
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun
# Icons
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
# MimeType entry in the desktop file
update-desktop-database &> /dev/null || :
# MIME package
update-mime-database %{_datadir}/mime &> /dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE.html README.Fedora Documentation/*
%{_bindir}/*
%{_libdir}/libunitsync.so
%{_libdir}/%{name}
%{_datadir}/mime/packages/%{name}.xml
%{_datadir}/icons/hicolor/48x48/*/*.png
%{_datadir}/applications/*.desktop
%{_datadir}/%{name}


%changelog
* Tue Mar 17 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-8
- use relative symlinks for the fonts
- fix perms in the 7zip sources
- handle the font package rename in F11

* Sun Mar 15 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-7
- add info about licensing
- use system fonts

* Mon Feb 02 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-6
- use cmake, as requested by upstream:
  http://spring.clan-sy.com/phpbb/viewtopic.php?p=330802#p330802

* Mon Feb 02 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-5
- use Fedora's compilation flags

* Sun Feb 01 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-4
- fix x86_64 build

* Sun Jan 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-2
- remove trademarks from summary and description
- add patch for python 2.6
- fix detection of devil libraries

* Sun Jan 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.2.1-1
- update to 0.78.2.1 (bugfix release)

* Sun Jan 18 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.1.1-2
- Other changes from the review:
  - remove Cmake-specific patch
  - drop meta-package

* Sat Jan 17 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.78.1.1-1
- Implement changes from the review (#478767):
  - improve description
  - add a README.Fedora file
  - remove commas from (build)requires
  - remove vendor from the desktop file
  - update to version 0.78.1.1

* Sun Jul 09 2006 Aurelien Bompard <abompard at fedoraproject.org> 0.77-1.b5
- initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Mar 2009 03:19:42 -0000	1.1
+++ .cvsignore	18 Mar 2009 06:30:25 -0000	1.2
@@ -0,0 +1 @@
+spring_0.78.2.1_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Mar 2009 03:19:42 -0000	1.1
+++ sources	18 Mar 2009 06:30:25 -0000	1.2
@@ -0,0 +1 @@
+4765d25d44f4bdc2f68af0f76743f30d  spring_0.78.2.1_src.tar.lzma


