rpms/glimmer/devel glimmer-chris.patch, 1.1, 1.2 glimmer.spec, 1.4, 1.5

[Christian Iseli]

Author: c4chris

Update of /cvs/extras/rpms/glimmer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14017

Modified Files:
	glimmer-chris.patch glimmer.spec 
Log Message:
Update patch for gcc-4.4

glimmer-chris.patch:

Index: glimmer-chris.patch
===================================================================
RCS file: /cvs/extras/rpms/glimmer/devel/glimmer-chris.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glimmer-chris.patch	15 Jan 2008 23:03:13 -0000	1.1
+++ glimmer-chris.patch	24 Feb 2009 16:48:18 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up glimmer3.02/src/Common/delcher.hh.chris glimmer3.02/src/Common/delcher.hh
 --- glimmer3.02/src/Common/delcher.hh.chris	2006-06-12 21:40:14.000000000 +0200
-+++ glimmer3.02/src/Common/delcher.hh	2008-01-15 22:54:53.000000000 +0100
++++ glimmer3.02/src/Common/delcher.hh	2009-02-24 17:25:50.000000000 +0100
 @@ -30,7 +30,7 @@
  #include  <iomanip>
  #include  <fstream>
@@ -10,3 +10,27 @@
  
  #include  "exceptions.hh"
  
+diff -up glimmer3.02/src/Common/gene.cc.chris glimmer3.02/src/Common/gene.cc
+--- glimmer3.02/src/Common/gene.cc.chris	2009-02-24 17:27:35.000000000 +0100
++++ glimmer3.02/src/Common/gene.cc	2009-02-24 17:27:46.000000000 +0100
+@@ -443,7 +443,7 @@ int  Char_Sub
+ //  Return a subscript corresponding to character  ch .
+ 
+   {
+-   char  * p;
++   const char  * p;
+ 
+    p = strchr (CONVERSION_STRING, tolower (ch));
+    if  (p == NULL)
+diff -up glimmer3.02/src/ICM/icm.cc.chris glimmer3.02/src/ICM/icm.cc
+--- glimmer3.02/src/ICM/icm.cc.chris	2009-02-24 17:29:20.000000000 +0100
++++ glimmer3.02/src/ICM/icm.cc	2009-02-24 17:33:45.000000000 +0100
+@@ -1981,7 +1981,7 @@ int  Subscript
+ //  model) for character  ch .
+ 
+   {
+-   char  * p;
++   const char  * p;
+ 
+    p = strchr (ALPHA_STRING, tolower (Filter (ch)));
+    if  (p == NULL)


Index: glimmer.spec
===================================================================
RCS file: /cvs/extras/rpms/glimmer/devel/glimmer.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- glimmer.spec	23 Feb 2009 14:57:51 -0000	1.4
+++ glimmer.spec	24 Feb 2009 16:48:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           glimmer
 Version:        3.02
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        System for finding genes in microbial DNA
 
 Group:          Applications/Engineering
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Feb 24 2009 Christian Iseli <Christian.Iseli at licr.org> - 3.02-5
+- Update patch for gcc-4.4
+
 * Mon Feb 23 2009 Christian Iseli <Christian.Iseli at licr.org> - 3.02-4
 - Rebuild for F-11