[google-perftools] 1.8

[Tom Callaway]

commit 892014bc4788ebdca5597631b1ab8b1a3b1bf785
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Mon Jul 18 13:02:46 2011 -0400

    1.8

 .gitignore                               |    1 +
 google-perftools-1.8-std-ptrdiff_t.patch |   12 ++++++++++++
 google-perftools.spec                    |   22 ++++++++--------------
 sources                                  |    2 +-
 4 files changed, 22 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79ebb9a..49eade1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 google-perftools-1.5.tar.gz
 google-perftools-1.6.tar.gz
 /google-perftools-1.7.tar.gz
+/google-perftools-1.8.tar.gz
diff --git a/google-perftools-1.8-std-ptrdiff_t.patch b/google-perftools-1.8-std-ptrdiff_t.patch
new file mode 100644
index 0000000..ad65aee
--- /dev/null
+++ b/google-perftools-1.8-std-ptrdiff_t.patch
@@ -0,0 +1,12 @@
+diff -up google-perftools-1.8/src/base/elf_mem_image.cc.std-ptrdifft google-perftools-1.8/src/base/elf_mem_image.cc
+--- google-perftools-1.8/src/base/elf_mem_image.cc.std-ptrdifft	2011-07-12 20:27:08.000000000 -0400
++++ google-perftools-1.8/src/base/elf_mem_image.cc	2011-07-18 12:56:34.254995578 -0400
+@@ -33,6 +33,8 @@
+ // Allow dynamic symbol lookup in an in-memory Elf image.
+ //
+ 
++#include <stddef.h>
++
+ #include "base/elf_mem_image.h"
+ 
+ #ifdef HAVE_ELF_MEM_IMAGE  // defined in elf_mem_image.h
diff --git a/google-perftools.spec b/google-perftools.spec
index 89753e7..b56efde 100644
--- a/google-perftools.spec
+++ b/google-perftools.spec
@@ -1,15 +1,13 @@
 Name:		google-perftools
-Version:	1.7
-Release:	4%{?dist}
+Version:	1.8
+Release:	1%{?dist}
 License:	BSD
 Group:		Development/Tools
 Summary:	Very fast malloc and performance analysis tools
 URL:		http://code.google.com/p/google-perftools/
 Source0:	http://google-perftools.googlecode.com/files/google-perftools-%{version}.tar.gz
-# http://code.google.com/p/google-perftools/issues/detail?id=309
-Patch0:		google-perftools-1.7-broken-comment-style.patch
-Patch1:		google-perftools-1.7-glibc-malloc-fix.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# http://code.google.com/p/google-perftools/issues/detail?id=355
+Patch0:		google-perftools-1.8-std-ptrdiff_t.patch
 # ppc64 still broken, bz 238390
 ExclusiveArch:	%{ix86} x86_64 ppc
 %ifnarch ppc ppc64
@@ -33,8 +31,7 @@ Libraries and headers for developing applications that use google-perftools.
 
 %prep
 %setup -q
-%patch0 -p1 -b .commentfix
-%patch1 -p1 -b .glibc-malloc-fix
+%patch0 -p1 -b .std-ptrdifft
 
 %build
 CXXFLAGS=`echo $RPM_OPT_FLAGS -DTCMALLOC_LARGE_PAGES| sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g'`
@@ -47,16 +44,12 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}/%{name}-%{version}/ install
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
 # Zero files
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/NEWS
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %check
 # http://code.google.com/p/google-perftools/issues/detail?id=153
 %ifnarch ppc
@@ -69,19 +62,20 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/pprof
 %{_mandir}/man1/*
 %{_docdir}/%{name}-%{version}/
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/google
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jul 18 2011 Tom Callaway <spot at fedoraproject.org> - 1.8-1
+- update to 1.8
+
 * Wed Jun 29 2011 Tom Callaway <spot at fedoraproject.org> - 1.7-4
 - fix tcmalloc compile against current glibc, fix derived from:
   http://src.chromium.org/viewvc/chrome?view=rev&revision=89800
diff --git a/sources b/sources
index 284e8a9..10ab2b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5839cab3723e68a86ed327ebb54d54bc  google-perftools-1.7.tar.gz
+13062bc53acfa01a57d851927a03d460  google-perftools-1.8.tar.gz