Fri Apr 17 16:40:48 2009 Google Inc. <opensource@google.com>

	* google-perftools: version 1.2 release
	* Allow large_alloc_threshold=0 to turn it off entirely (csilvers)
	* Die more helpfully when out of memory for internal data (csilvers)
	* Refactor profile-data gathering, add a new unittest (cgd, nabeelmian)
	* BUGFIX: fix rounding errors with static thread-size caches (addi)
	* BUGFIX: disable hooks better when forking in leak-checker (csilvers)
	* BUGFIX: fix realloc of crt pointers on windows (csilvers)
	* BUGFIX: do a better job of finding binaries in .sh tests (csilvers)
	* WINDOWS: allow overriding malloc/etc instead of patching (mbelshe)
	* PORTING: fix compilation error in a ppc-specific file (csilvers)
	* PORTING: deal with quirks in cygwin's /proc/self/maps (csilvers)
	* PORTING: use 'A' version of functions for ascii input (mbelshe)
	* PORTING: generate .so's on cygwin and mingw (ajenjo)
	* PORTING: disable profiler methods on cygwin (jperkins)
	* Updated autoconf version to 2.61 and libtool version to 1.5.26


git-svn-id: http://gperftools.googlecode.com/svn/trunk@68 6b5cf1ce-ec42-a296-1ba9-69fdba395a50

3 files changed, 36 insertions, 19 deletions

diff --git a/packages/deb/changelog b/packages/deb/changelog
index 6deb094..a801f43 100644
--- a/packages/deb/changelog
+++ b/packages/deb/changelog
@@ -1,3 +1,9 @@
+google-perftools (1.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Google Inc. <opensource@google.com>  Fri, 17 Apr 2009 16:40:48 -0700
+
 google-perftools (1.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/packages/rpm.sh b/packages/rpm.sh
index a5699a2..a655080 100755
--- a/packages/rpm.sh
+++ b/packages/rpm.sh
@@ -47,7 +47,18 @@ mkdir "$RPM_BUILD_DIR"
 
 cp "$archive" "$RPM_SOURCE_DIR"
 
-rpmbuild -bb rpm/rpm.spec \
+# rpmbuild -- as far as I can tell -- asks the OS what CPU it has.
+# This may differ from what kind of binaries gcc produces.  dpkg
+# does a better job of this, so if we can run 'dpkg --print-architecture'
+# to get the build CPU, we use that in preference of the rpmbuild
+# default.
+target=`dpkg --print-architecture 2>/dev/null`   # "" if dpkg isn't found
+if [ -n "$target" ]
+then
+   target=" --target $target"
+fi
+
+rpmbuild -bb rpm/rpm.spec $target \
   --define "NAME $PACKAGE" \
   --define "VERSION $VERSION" \
   --define "_sourcedir $RPM_SOURCE_DIR" \
diff --git a/packages/rpm/rpm.spec b/packages/rpm/rpm.spec
index 2b292bf..e3fc71c 100644
--- a/packages/rpm/rpm.spec
+++ b/packages/rpm/rpm.spec
@@ -66,25 +66,25 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/cpuprofile.html doc/cpuprofile-fileformat.html
 %doc doc/pprof-test-big.gif doc/pprof-test.gif doc/pprof-vsnprintf-big.gif doc/pprof-vsnprintf.gif
 
-%{prefix}/lib/libtcmalloc.so.0
-%{prefix}/lib/libtcmalloc.so.0.0.0
-%{prefix}/lib/libtcmalloc_minimal.so.0
-%{prefix}/lib/libtcmalloc_minimal.so.0.0.0
-%{prefix}/lib/libprofiler.so.0
-%{prefix}/lib/libprofiler.so.0.0.0
-%{prefix}/bin/pprof
-%{prefix}/man/man1/pprof.1.gz
+%{_libdir}/libtcmalloc.so.0
+%{_libdir}/libtcmalloc.so.0.0.0
+%{_libdir}/libtcmalloc_minimal.so.0
+%{_libdir}/libtcmalloc_minimal.so.0.0.0
+%{_libdir}/libprofiler.so.0
+%{_libdir}/libprofiler.so.0.0.0
+%{_bindir}/pprof
+%{_mandir}/man1/pprof.1.gz
 
 %files devel
 %defattr(-,root,root)
 
-%{prefix}/include/google
-%{prefix}/lib/libtcmalloc.a
-%{prefix}/lib/libtcmalloc.la
-%{prefix}/lib/libtcmalloc.so
-%{prefix}/lib/libtcmalloc_minimal.a
-%{prefix}/lib/libtcmalloc_minimal.la
-%{prefix}/lib/libtcmalloc_minimal.so
-%{prefix}/lib/libprofiler.a
-%{prefix}/lib/libprofiler.la
-%{prefix}/lib/libprofiler.so
+%{_includedir}/google
+%{_libdir}/libtcmalloc.a
+%{_libdir}/libtcmalloc.la
+%{_libdir}/libtcmalloc.so
+%{_libdir}/libtcmalloc_minimal.a
+%{_libdir}/libtcmalloc_minimal.la
+%{_libdir}/libtcmalloc_minimal.so
+%{_libdir}/libprofiler.a
+%{_libdir}/libprofiler.la
+%{_libdir}/libprofiler.so