From bc72e23626e9a2ba745334e4840403a395160043 Mon Sep 17 00:00:00 2001
From: "John A. Khvatov" <ivaxer@fedoraproject.org>
Date: Thu, 26 Feb 2009 23:40:29 +0000
Subject: [PATCH] fixes for gcc 4.4

---
 glog-gcc4.4.patch         | 60 +++++++++++++++++++++++++++++++++++++++
 glog-missing-header.patch | 10 -------
 glog.spec                 |  8 +++---
 import.log                |  1 +
 4 files changed, 65 insertions(+), 14 deletions(-)
 create mode 100644 glog-gcc4.4.patch
 delete mode 100644 glog-missing-header.patch

diff --git a/glog-gcc4.4.patch b/glog-gcc4.4.patch
new file mode 100644
index 0000000..9b42117
--- /dev/null
+++ b/glog-gcc4.4.patch
@@ -0,0 +1,60 @@
+index 8e41d5e..d4bb7de 100644
+--- src/googletest.h
++++ src/googletest.h
+@@ -14,6 +14,9 @@
+ #include <string>
+ #include <vector>
+
++#include <stdio.h>
++#include <stdlib.h>
++
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
+index 14c9789..47ba36f 100644
+--- src/logging_unittest.cc
++++ src/logging_unittest.cc
+@@ -23,6 +23,9 @@
+ #include <string>
+ #include <vector>
+
++#include <stdio.h>
++#include <stdlib.h>
++
+ #include "base/commandlineflags.h"
+ #include "glog/logging.h"
+ #include "glog/raw_logging.h"
+index e6e3e70..0e1b6cb 100644
+--- src/symbolize.cc
++++ src/symbolize.cc
+@@ -414,7 +414,7 @@ class LineReader {
+
+   char *FindLineFeed() {
+     return reinterpret_cast<char *>
+-      (memchr(reinterpret_cast<const void *>(bol_), '\n', eod_ - bol_));
++      (memchr(reinterpret_cast<void *>(bol_), '\n', eod_ - bol_));
+   }
+
+   bool BufferIsEmpty() {
+@@ -428,7 +428,7 @@ class LineReader {
+   const int fd_;
+   char * const buf_;
+   const int buf_len_;
+-  const char *bol_;
++  char *bol_;
+   char *eol_;
+   const char *eod_;  // End of data in "buf_".
+ };
+index e8cbc0c..f06bcdd 100644
+--- src/utilities.cc
++++ src/utilities.cc
+@@ -3,6 +3,9 @@
+
+ #include "utilities.h"
+
++#include <stdio.h>
++#include <stdlib.h>
++
+ #include <signal.h>
+ #ifdef HAVE_SYS_TIME_H
+ # include <sys/time.h>
diff --git a/glog-missing-header.patch b/glog-missing-header.patch
deleted file mode 100644
index 80c1a68..0000000
--- a/glog-missing-header.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/utilities.cc	2009-01-23 04:37:14.000000000 +0300
-+++ src/utilities.cc	2009-02-27 00:18:51.000000000 +0300
-@@ -3,6 +3,7 @@
- 
- #include "utilities.h"
- 
-+#include <stdio.h>
- #include <signal.h>
- #ifdef HAVE_SYS_TIME_H
- # include <sys/time.h>
diff --git a/glog.spec b/glog.spec
index 96c1bb7..c7dbacc 100644
--- a/glog.spec
+++ b/glog.spec
@@ -1,6 +1,6 @@
 Name:           glog
 Version:        0.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A C++ application logging library
 
 Group:          System Environment/Libraries
@@ -8,7 +8,7 @@ License:        BSD
 URL:            http://code.google.com/p/google-glog
 Source0:        http://google-glog.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         glog-r38.patch
-Patch1:         glog-missing-header.patch
+Patch1:         glog-gcc4.4.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:  autoconf
@@ -70,8 +70,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Fri Feb 27 2009 John A. Khvatov <ivaxer@fedoraproject.org> 0.2-4
-- Added missing header for gcc 4.4
+* Fri Feb 27 2009 John A. Khvatov <ivaxer@fedoraproject.org> 0.2-5
+- fixes for gcc 4.4
 
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/import.log b/import.log
index cb5e208..d6db9dd 100644
--- a/import.log
+++ b/import.log
@@ -1,3 +1,4 @@
 glog-0_1_2-6_fc10:HEAD:glog-0.1.2-6.fc10.src.rpm:1229343821
 glog-0_2-2_fc10:HEAD:glog-0.2-2.fc10.src.rpm:1232879474
 glog-0_2-4_fc10:HEAD:glog-0.2-4.fc10.src.rpm:1235684646
+glog-0_2-5_fc10:HEAD:glog-0.2-5.fc10.src.rpm:1235691384