rpms/spring/F-12 spring-0.80.5.2-staticlib.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 spring-README.Fedora, 1.1, 1.2 spring.spec, 1.10, 1.11

[Aurelien Bompard]

Author: abompard

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

Modified Files:
	.cvsignore sources spring-README.Fedora spring.spec 
Added Files:
	spring-0.80.5.2-staticlib.patch 
Log Message:
* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
- New release: 0.80.5.2


spring-0.80.5.2-staticlib.patch:
 CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE spring-0.80.5.2-staticlib.patch ---
diff -up ./rts/lib/liblobby/CMakeLists.txt.staticlib ./rts/lib/liblobby/CMakeLists.txt
--- ./rts/lib/liblobby/CMakeLists.txt.staticlib	2009-12-24 08:31:38.501099163 +0100
+++ ./rts/lib/liblobby/CMakeLists.txt	2009-12-24 08:31:52.239960507 +0100
@@ -1,4 +1,4 @@
-add_library(lobby Connection)
+add_library(lobby STATIC Connection)
 target_link_libraries(lobby ${WIN32_LIBRARIES} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY})
 
 add_executable(testapp EXCLUDE_FROM_ALL Test/testapp)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	20 Sep 2009 11:35:37 -0000	1.8
+++ .cvsignore	28 Dec 2009 21:37:16 -0000	1.9
@@ -1 +1 @@
-spring_0.80.4.2_src.tar.lzma
+spring_0.80.5.2_src.tar.lzma


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	20 Sep 2009 11:35:37 -0000	1.8
+++ sources	28 Dec 2009 21:37:16 -0000	1.9
@@ -1 +1 @@
-4c67e82316b282e313b84a1f48b6e90d  spring_0.80.4.2_src.tar.lzma
+61775b3fda894fd2dd39eb03178943c3  spring_0.80.5.2_src.tar.lzma


Index: spring-README.Fedora
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/spring-README.Fedora,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- spring-README.Fedora	18 Mar 2009 06:26:27 -0000	1.1
+++ spring-README.Fedora	28 Dec 2009 21:37:16 -0000	1.2
@@ -7,7 +7,7 @@ download some mods and click on the file
 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
+http://springrts.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


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-12/spring.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- spring.spec	20 Sep 2009 11:35:37 -0000	1.10
+++ spring.spec	28 Dec 2009 21:37:16 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           spring
-Version:        0.80.4.2
+Version:        0.80.5.2
 Release:        1%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
@@ -18,6 +18,8 @@ Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
 Patch0:         spring-0.80.2-allegro.patch
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+Patch1:         spring-0.80.5.2-staticlib.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -55,10 +57,14 @@ 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 .staticlib
 find rts/lib/7z -type f | xargs chmod -x 
 
 
 %build
+# BUILD_SHARED_LIBS = ON causes a build failure:
+# http://springrts.com/phpbb/viewtopic.php?f=12&t=21120&p=399610
+#       -DBUILD_SHARED_LIBS:BOOL=OFF \
 %cmake -DDATADIR:PATH=share/%{name} \
        -DLIBDIR:PATH=%{_lib} \
        .
@@ -127,7 +133,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_libdir}/libunitsync.so
 %{_libdir}/libspringserver.so
-%{_libdir}/%{name}
+#%{_libdir}/%{name}
 %{_datadir}/mime/packages/%{name}.xml
 %{_datadir}/icons/hicolor/48x48/*/*.png
 %{_datadir}/applications/*.desktop
@@ -135,6 +141,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 21 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.5.2-1
+- New release: 0.80.5.2
+
 * Sun Sep 20 2009 Aurelien Bompard <abompard at fedoraproject.org> -  0.80.4.2-1
 - New release: 0.80.4.2 (bugfix)