diff --git a/.gitignore b/.gitignore index 5fbfa15..c1c029e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jemalloc-2.0.1.tar.bz2 +/jemalloc-2.1.0.tar.bz2 diff --git a/jemalloc-2.0.1.no_pprof.patch b/jemalloc-2.1.0.no_pprof.patch similarity index 59% rename from jemalloc-2.0.1.no_pprof.patch rename to jemalloc-2.1.0.no_pprof.patch index c9866c1..5ccd8e7 100644 --- a/jemalloc-2.0.1.no_pprof.patch +++ b/jemalloc-2.1.0.no_pprof.patch @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2010-11-18 10:58:56.977574922 +0100 -+++ Makefile.in 2010-11-18 10:59:32.307037415 +0100 -@@ -41,7 +41,6 @@ +--- Makefile.in.orig 2010-12-04 02:05:01.000000000 +0100 ++++ Makefile.in 2011-01-05 23:13:32.000000000 +0100 +@@ -42,7 +42,6 @@ endif # Lists of files. @@ -8,7 +8,7 @@ CHDRS := @objroot@include/jemalloc/jemalloc@install_suffix@.h \ @objroot@include/jemalloc/jemalloc_defs@install_suffix@.h CSRCS := @srcroot@src/jemalloc.c @srcroot@src/arena.c @srcroot@src/base.c \ -@@ -103,13 +102,6 @@ +@@ -123,13 +122,6 @@ $(CC) -o $@ $< -L@objroot@lib -ljemalloc@install_suffix@ endif @@ -22,12 +22,3 @@ install_include: install -d $(INCLUDEDIR)/jemalloc @for h in $(CHDRS); do \ -@@ -130,7 +122,7 @@ - install -m 644 $$m $(MANDIR)/man3; \ - done - --install: install_bin install_include install_lib install_man -+install: install_include install_lib install_man - - tests: $(CTESTS:@srcroot@%.c=@objroot@%) - diff --git a/jemalloc.spec b/jemalloc.spec index 5efe865..95d3be8 100644 --- a/jemalloc.spec +++ b/jemalloc.spec @@ -1,7 +1,7 @@ Name: jemalloc -Version: 2.0.1 +Version: 2.1.0 -Release: 3%{?dist} +Release: 1%{?dist} Summary: General-purpose scalable concurrent malloc implementation Group: System Environment/Libraries @@ -11,10 +11,12 @@ Source0: http://www.canonware.com/download/jemalloc/%{name}-%{version}.ta BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Remove pprof, as it already exists in google-perftools -Patch0: jemalloc-2.0.1.no_pprof.patch +Patch0: jemalloc-2.1.0.no_pprof.patch # check for __s390__ as it's defined on both s390 and s390x Patch1: jemalloc-2.0.1-s390.patch +BuildRequires: /usr/bin/xsltproc + %description General-purpose scalable concurrent malloc(3) implementation. This distribution is the stand-alone "portable" implementation of %{name}. @@ -34,6 +36,8 @@ developing applications that use %{name}. %patch1 -p1 -b .s390 %build +# This is truncated during build. Seems interesting to save. +mv VERSION version %configure make %{?_smp_mflags} @@ -41,6 +45,9 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} +mv version VERSION +# Install this with doc macro instead +rm %{buildroot}%{_datadir}/doc/%{name}/jemalloc.html # None of these in fedora find %{buildroot}%{_libdir}/ -name '*.a' -exec rm -vf {} ';' @@ -54,6 +61,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_libdir}/libjemalloc.so.* %doc COPYING README VERSION +%doc doc/jemalloc.html %files devel %defattr(-,root,root,-) @@ -66,6 +74,11 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig %changelog +* Wed Jan 05 2011 Ingvar Hagelund - 2.1.0-1 +- New upstream release +- Updated patch to remove pprof +- Added html doc and xsltproc as a requirement to build it + * Sat Dec 11 2010 Dan HorĂ¡k - 2.0.1-3 - fix build on s390 diff --git a/sources b/sources index 6269d37..09df344 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4687f59c073975f39375ece49c402bdc jemalloc-2.0.1.tar.bz2 +62fb8f8ab1e5683991ecd9de338630a2 jemalloc-2.1.0.tar.bz2