rpms/celestia/devel celestia-1.3.2-compile.patch, NONE, 1.1 celestia.spec, 1.4, 1.5

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/celestia/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv14371

Modified Files:
	celestia.spec 
Added Files:
	celestia-1.3.2-compile.patch 
Log Message:
Add update from Marius (fedora.us #2271).

celestia-1.3.2-compile.patch:

--- NEW FILE celestia-1.3.2-compile.patch ---
--- /home/mlj/rpm/BUILD/celestia-1.3.2/src/celutil/resmanager.h.orig	2004-11-10 22:41:15.132616864 +0100
+++ /home/mlj/rpm/BUILD/celestia-1.3.2/src/celutil/resmanager.h	2004-11-10 22:42:26.605935972 +0100
@@ -56,6 +56,9 @@
     typedef std::map<T, ResourceHandle> ResourceHandleMap;
     typedef std::map<std::string, ResourceType*> NameMap;
 
+    typedef typename ResourceHandleMap::value_type ResourceHandleMapValue;
+    typedef typename NameMap::value_type NameMapValue;
+
     ResourceTable resources;
     ResourceHandleMap handles;
     NameMap loadedResources;
@@ -72,7 +75,7 @@
         {
             ResourceHandle h = handles.size();
             resources.insert(resources.end(), info);
-            handles.insert(ResourceHandleMap::value_type(info, h));
+            handles.insert(ResourceHandleMapValue(info, h));
             return h;
         }
     }
@@ -105,7 +108,7 @@
                     else
                     {
                         resources[h].state = ResourceLoaded;
-                        loadedResources.insert(NameMap::value_type(resources[h].resolvedName, resources[h].resource));
+                        loadedResources.insert(NameMapValue(resources[h].resolvedName, resources[h].resource));
                     }
                 }
             }


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- celestia.spec	11 Nov 2004 19:21:36 -0000	1.4
+++ celestia.spec	13 Nov 2004 22:10:04 -0000	1.5
@@ -7,6 +7,7 @@
 License:        GPL
 Source0:        http://dl.sf.net/celestia/celestia-1.3.2.tar.gz
 Source3:        celestia.desktop
+Patch0:         %{name}-1.3.2-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,6 +37,7 @@
 
 %prep
 %setup -q
+%patch0 -p6 -b .orig
 
 
 %build
@@ -93,6 +95,9 @@
 * Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.3.2-2
 - Bump release to provide Extras upgrade path.
 
+* Wed Nov 10 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:1.3.2-0.fdr.2
+- Fixed FC3 compilation.
+
 * Sat Aug 28 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:1.3.2-0.fdr.1
 - Updated to 1.3.2.
 - Switched to using GNOME frontend.