rpms/ember/devel ember-0.5.6-fix_implicit_dso.patch, NONE, 1.1 ember.spec, 1.19, 1.20

Michel Alexandre Salim salimma at fedoraproject.org
Sun Jul 4 14:20:48 UTC 2010


Author: salimma

Update of /cvs/pkgs/rpms/ember/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15335/devel

Modified Files:
	ember.spec 
Added Files:
	ember-0.5.6-fix_implicit_dso.patch 
Log Message:
* Sun Jul  4 2010 Michel Salim <salimma at fedoraproject.org> - 0.5.6-5
- Fix implicit DSO bug (#565162)


ember-0.5.6-fix_implicit_dso.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE ember-0.5.6-fix_implicit_dso.patch ---
--- ember-0.5.6/configure.fix_implicit_dso	2009-03-29 14:39:35.000000000 +0200
+++ ember-0.5.6/configure	2010-07-04 16:01:47.645285571 +0200
@@ -22510,7 +22510,7 @@
 $as_echo "$ac_cv_lib_GL_glViewport" >&6; }
 if test "x$ac_cv_lib_GL_glViewport" = x""yes; then
 
-    LIBS="$LIBS -lGL"
+    LIBS="$LIBS -lGL -lX11"
 	CXXFLAGS="$CXXFLAGS -I/usr/X11R6/include -I/usr/include"
 
 else


Index: ember.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ember/devel/ember.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ember.spec	5 Oct 2009 20:27:47 -0000	1.19
+++ ember.spec	4 Jul 2010 14:20:48 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           ember
 Version:        0.5.6
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        3D client for WorldForge
 
 Group:          Amusements/Games
@@ -8,6 +8,7 @@ License:        GPLv3+
 URL:            http://www.worldforge.org/dev/eng/clients/ember
 Source0:        http://downloads.sourceforge.net/worldforge/%{name}-%{version}.tar.bz2
 Patch0:         ember-0.5.6-gcc44.patch
+Patch1:         ember-0.5.6-fix_implicit_dso.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel tinyxml-devel DevIL-devel cegui-devel ogre-devel
@@ -25,6 +26,7 @@ It uses the Ogre 3D engine with CEGUI.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # Encoding fix
 iconv -f iso-8859-1 -t utf-8 AUTHORS > AUTHORS.conv && mv -f AUTHORS.conv AUTHORS
@@ -87,6 +89,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jul  4 2010 Michel Salim <salimma at fedoraproject.org> - 0.5.6-5
+- Fix implicit DSO bug (#565162)
+
 * Tue Oct 06 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.5.6-4
 - Rebuild for varconf interface version bump
 



More information about the scm-commits mailing list