rpms/spring/F-13 spring-dlopen.patch,NONE,1.1 spring.spec,1.18,1.19

Aurelien Bompard abompard at fedoraproject.org
Sun May 2 22:03:59 UTC 2010


Author: abompard

Update of /cvs/pkgs/rpms/spring/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3059/F-13

Modified Files:
	spring.spec 
Added Files:
	spring-dlopen.patch 
Log Message:
* Sun May 02 2010 Bruno Wolff III <bruno at wolff.to> - 0.81.2.1-2
- Fix DSO linking issue with dlopen - bz565103
- Package man pages


spring-dlopen.patch:
 CMakeLists.txt |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE spring-dlopen.patch ---
--- rts/CMakeLists.txt	2010-05-02 12:15:20.000000000 -0500
+++ rts/CMakeLists.txt	2010-05-02 12:35:28.000000000 -0500
@@ -132,6 +132,7 @@ 
 ### only use the directory for target platform
 IF (UNIX)
 	AUX_SOURCE_DIRECTORY(System/Platform/Linux sysfiles)
+	LIST(APPEND spring_libraries dl)
 ELSE (UNIX)
 	AUX_SOURCE_DIRECTORY(System/Platform/Win sysfiles)
 ENDIF (UNIX)


Index: spring.spec
===================================================================
RCS file: /cvs/pkgs/rpms/spring/F-13/spring.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- spring.spec	21 Mar 2010 10:57:20 -0000	1.18
+++ spring.spec	2 May 2010 22:03:59 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           spring
 Version:        0.81.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Multiplayer, 3D realtime strategy combat game
 
 Group:          Amusements/Games
@@ -18,6 +18,7 @@ Source1:        spring-README.Fedora
 
 # Teach CMake to find allegro
 Patch0:         spring-0.80.2-allegro.patch
+Patch1:         spring-dlopen.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,6 +27,8 @@ BuildRequires:  glew-devel libvorbis-dev
 BuildRequires:  freetype-devel python-devel allegro-devel zip
 BuildRequires:  java-devel-openjdk p7zip-plugins
 BuildRequires:  desktop-file-utils
+# Man page generation
+BuildRequires:  libxslt asciidoc docbook-style-xsl
 
 Requires:       spring-lobby spring-installer spring-maps-default
 
@@ -55,6 +58,7 @@ 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 .dlopen
 find rts/lib/7z -type f | xargs chmod -x 
 
 
@@ -135,9 +139,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/icons/hicolor/48x48/*/*.png
 %{_datadir}/applications/*.desktop
 %{_datadir}/%{name}
+%{_mandir}/man6/*
 
 
 %changelog
+* Sun May 02 2010 Bruno Wolff III <bruno at wolff.to> - 0.81.2.1-2
+- Fix DSO linking issue with dlopen - bz565103
+- Package man pages
+
 * Sun Mar 21 2010 Aurelien Bompard <abompard at fedoraproject.org> -  0.81.2.1-1
 - New release: 0.81.2.1 (bugfix)
 



More information about the scm-commits mailing list