rpms/colossus/F-10 4485.patch, NONE, 1.1 4486.patch, NONE, 1.1 colossus.spec, 1.2, 1.3

[Bruno Wolff III]

Author: bruno

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

Modified Files:
	colossus.spec 
Added Files:
	4485.patch 4486.patch 
Log Message:
Grab a couple of upstream bugfix patches



4485.patch:
 TerrainRecruitLoader.java |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 4485.patch ---
--- core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4484)
+++ core/src/main/java/net/sf/colossus/xmlparser/TerrainRecruitLoader.java	(revision 4485)
@@ -969,7 +969,7 @@
                 + "old is " + g_value + " while new is " + theNumber
                 + " when " + recruiter.getName() + " recruits "
                 + recruit.getName() + " in " + terrain.getId() + " on hex "
-                + hex.getLabel());
+                + (hex != null ? hex.getLabel() : "[hex is null]"));
             LOGGER.warning("The RST is\n"
                 + terrain.getRecruitingSubTree().toString());
         }

4486.patch:
 MasterBoard.java |    5 +++++
 1 file changed, 5 insertions(+)

--- NEW FILE 4486.patch ---
--- core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4485)
+++ core/src/main/java/net/sf/colossus/gui/MasterBoard.java	(revision 4486)
@@ -888,6 +888,11 @@
         String propName = "java.util.logging.FileHandler.pattern";
         String logPattern = LogManager.getLogManager().getProperty(propName);
 
+        if (logPattern == null)
+        {
+            return "<UNKNOWN> (system property "
+                + " \"java.util.logging.FileHandler.pattern\" is not set?)";
+        }
         // Replace %t with Java's idea of system temp directory:
         if (logPattern.startsWith("%t"))
         {


Index: colossus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/colossus/F-10/colossus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- colossus.spec	11 Aug 2009 05:47:55 -0000	1.2
+++ colossus.spec	16 Aug 2009 17:41:02 -0000	1.3
@@ -2,7 +2,7 @@ Name:           colossus
 %define         rev        4482
 %define         revdate    20090810
 Version:        0.9.0
-Release:        1.%{revdate}svn%{rev}%{?dist}
+Release:        2.%{revdate}svn%{rev}%{?dist}
 Summary:        Allows people to play Titan against each other or AIs
 
 Group:          Amusements/Games
@@ -20,6 +20,8 @@ URL:            http://colossus.sourcefo
 Source0:        colossus-%{revdate}-%{rev}.tar.gz
 Source1:        colossus-gen-tarball.sh
 Source2:        colossus-rev.xsl
+Patch1:	4485.patch
+Patch2:	4486.patch
 
 %global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
 
@@ -64,6 +66,8 @@ This package contains the API documentat
 
 %prep
 %setup -q -n %{name}-%{revdate}-%{rev}
+%patch1
+%patch2
 
 %build
 
@@ -179,6 +183,10 @@ touch --no-create %{_datadir}/pixmaps ||
 
 %changelog
 
+* Sun Aug 19 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-2.20090810svn4482
+- Patch 4485 Fix creature info popup
+- Patch 4486 Fix Help problem when a logging property is not set
+
 * Mon Aug 10 2009 Bruno Wolff III <bruno at wolff.to> - 0.9.0-1.20090810svn4482
 - New public build.
 - Upstream is now using real version numbers.