rpms/igraph/F-8 igraph-cstdlib.patch,1.1,1.2 igraph.spec,1.2,1.3

[Neal Becker (nbecker)]

Author: nbecker

Update of /cvs/pkgs/rpms/igraph/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16592

Modified Files:
	igraph-cstdlib.patch igraph.spec 
Log Message:
Fix patch


igraph-cstdlib.patch:

Index: igraph-cstdlib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-8/igraph-cstdlib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- igraph-cstdlib.patch	16 Feb 2008 00:20:48 -0000	1.1
+++ igraph-cstdlib.patch	16 Feb 2008 20:47:26 -0000	1.2
@@ -1,40 +1,44 @@
+diff --git a/src/bliss_graph.cc b/src/bliss_graph.cc
+--- a/src/bliss_graph.cc
++++ b/src/bliss_graph.cc
+@@ -25,6 +25,7 @@
+ #include "bliss_timer.hh"
+ #include "bliss_graph.hh"
+ #include "bliss_partition.hh"
++#include <limits.h>		// INT_MAX,etc
+ 
+ namespace igraph {
+ 
+diff --git a/src/bliss_kqueue.hh b/src/bliss_kqueue.hh
+--- a/src/bliss_kqueue.hh
++++ b/src/bliss_kqueue.hh
+@@ -19,6 +19,7 @@
+ #define KQUEUE_HH
+ 
+ #include "bliss_defs.hh"
++#include <cstdlib>		// malloc
+ 
+ namespace igraph {
+ 
+diff --git a/src/bliss_kstack.hh b/src/bliss_kstack.hh
+--- a/src/bliss_kstack.hh
++++ b/src/bliss_kstack.hh
+@@ -19,6 +19,7 @@
+ #define KSTACK_H
+ 
+ #include "bliss_defs.hh"
++#include <cstdlib>		// malloc
+ 
+ namespace igraph {
+ 
 diff --git a/src/walktrap_graph.cpp b/src/walktrap_graph.cpp
 --- a/src/walktrap_graph.cpp
 +++ b/src/walktrap_graph.cpp
-@@ -28,6 +28,9 @@
- #include <iostream>
+@@ -29,6 +29,7 @@
  #include <fstream>
  #include <sstream>
-+#include <cstdlib>		// exit
+ #include <algorithm>
 +#include <cstring>		// strlen
-+#include <algorithm>		// sort
  #include "walktrap_graph.h"
  
  using namespace std;
-@@ -144,7 +147,7 @@
-   for(int i = 0; i < G.nb_vertices; i++) {
-     if(G.vertices[i].degree == 0) {
-       cerr << "error : degree of vertex " << i << " is 0" << endl;
--      exit(0);
-+      std::exit(0);
-     }
-     G.vertices[i].edges = new Edge[G.vertices[i].degree + 1];
-     G.vertices[i].edges[0].neighbor = i;
-@@ -163,7 +166,7 @@
-   }  
-   
-   for(int i = 0; i < G.nb_vertices; i++)
--    sort(G.vertices[i].edges, G.vertices[i].edges+G.vertices[i].degree);
-+    std::sort(G.vertices[i].edges, G.vertices[i].edges+G.vertices[i].degree);
- 
-   for(int i = 0; i < G.nb_vertices; i++) {  // merge multi edges
-     int a = 0;
-@@ -186,7 +189,7 @@
-   if(index != 0) {
-     m += long(nb_vertices)*sizeof(char*);
-     for(int i = 0; i < nb_vertices; i++)
--      m += strlen(index[i]) + 1;
-+      m += std::strlen(index[i]) + 1;
-   }
-   return m;
- }


Index: igraph.spec
===================================================================
RCS file: /cvs/pkgs/rpms/igraph/F-8/igraph.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- igraph.spec	16 Feb 2008 00:18:47 -0000	1.2
+++ igraph.spec	16 Feb 2008 20:47:26 -0000	1.3
@@ -1,12 +1,12 @@
 Name:		igraph
-Version:	0.4.5
-Release:	7%{?dist}
+Version:	0.5
+Release:	6%{?dist}
 Summary:	Library for creating and manipulating graphs
 
 Group:		System Environment/Libraries
 License:	GPLv2+
 URL:		http://cneurocvs.rmki.kfki.hu/igraph
-Source0:	http://igraph.googlecode.com/files/igraph-0.4.5.tar.gz
+Source0:	http://igraph.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch1:		igraph-cstdlib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,6 +85,24 @@
 %doc examples
 
 %changelog
+* Sat Feb 16 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-6
+- fix patch
+
+* Sat Feb 16 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-5
+- More patches
+
+* Sat Feb 16 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-4
+- Try again to fix patch
+
+* Sat Feb 16 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-3
+- fix patch
+
+* Sat Feb 16 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-2
+- Still need patch1
+
+* Fri Feb 15 2008 Neal Becker <ndbecker2 at gmail.com> - 0.5-1
+- update to 0.5
+
 * Wed Feb 13 2008 Neal Becker <ndbecker2 at gmail.com> - 0.4.5-7
 - Try again with that patch