diff --git a/jemalloc.changes b/jemalloc.changes index 41541db..97204b8 100644 --- a/jemalloc.changes +++ b/jemalloc.changes @@ -13,6 +13,7 @@ Wed May 4 07:30:43 UTC 2016 - idonmez@suse.com * Fix a variety of test failures that were due to test fragility rather than core bugs. - Remove disable_oom_test.patch, fixed upstream. +- Run testsuite in parallel where possible ------------------------------------------------------------------- Wed Apr 20 12:11:43 UTC 2016 - jslaby@suse.com diff --git a/jemalloc.spec b/jemalloc.spec index b5167cb..29e60e4 100644 --- a/jemalloc.spec +++ b/jemalloc.spec @@ -25,11 +25,11 @@ License: BSD-2-Clause Group: Development/Libraries/C and C++ Url: http://canonware.com/jemalloc/ #Git-Clone: git://canonware.com/jemalloc -Source: http://www.canonware.com/download/jemalloc/jemalloc-%{version}.tar.bz2 +Source: http://www.canonware.com/download/jemalloc/jemalloc-%version.tar.bz2 BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt BuildRequires: pkg-config -Requires: %{lname} = %{version} +Requires: %lname = %version BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} == 1110 BuildRequires: gcc48 @@ -39,18 +39,18 @@ BuildRequires: gcc48 jemalloc is a general-purpose scalable concurrent malloc(3) implementation. This package provides a shell wrapper script to run programs using jemalloc. -%package -n %{lname} +%package -n %lname Summary: General-purpose scalable concurrent malloc implementation Group: System/Libraries -%description -n %{lname} +%description -n %lname General-purpose scalable concurrent malloc(3) implementation. This distribution is the stand-alone "portable" version of jemalloc. %package devel Summary: Development files for jemalloc Group: Development/Libraries/C and C++ -Requires: %{lname} = %{version} +Requires: %lname = %version %description devel Headers for jemalloc, general-purpose scalable concurrent malloc(3) @@ -59,7 +59,7 @@ implementation. %package devel-static Summary: Static libraries for jemalloc Group: Development/Libraries/C and C++ -Requires: %{name}-devel = %{version} +Requires: %name-devel = %version %description devel-static Static libraries of jemalloc, general-purpose scalable concurrent @@ -69,15 +69,15 @@ malloc(3) implementation. %setup -q %build -export EXTRA_CFLAGS="%{optflags} -std=gnu99" +export EXTRA_CFLAGS="%optflags -std=gnu99" %if 0%{?suse_version} == 1110 -if [ -f "%{_bindir}/gcc-4.6" ]; then +if [ -f "%_bindir/gcc-4.6" ]; then export CC=gcc-4.6 fi -if [ -f "%{_bindir}/gcc-4.7" ]; then +if [ -f "%_bindir/gcc-4.7" ]; then export CC=gcc-4.7 fi -if [ -f "%{_bindir}/gcc-4.8" ]; then +if [ -f "%_bindir/gcc-4.8" ]; then export CC=gcc-4.8 fi %endif @@ -86,43 +86,43 @@ fi make %{?_smp_mflags} %install -b=%{buildroot} +b="%buildroot" make install DESTDIR="$b" -chmod -x "%{buildroot}/%{_libdir}"/*.a -if [ "%{_docdir}" != "%{_datadir}/doc" ]; then - # stupid Makefile does not allow to set it - mkdir -p "$b/%{_docdir}" - mv "$b/%{_datadir}/doc/jemalloc" "$b/%{_docdir}/%{name}" +chmod -x "%buildroot/%_libdir"/*.a +if [ "%_docdir" != "%_datadir/doc" ]; then + # Makefile apparently ignored the --docdir in %%configure + mkdir -p "$b/%_docdir" + mv "$b/%_datadir/doc/jemalloc" "$b/%_docdir/%name" fi %check export LD_LIBRARY_PATH="$PWD/lib:$LD_LIBRARY_PATH" make %{?_smp_mflags} check -%post -n %{lname} -p /sbin/ldconfig -%postun -n %{lname} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root) -%{_bindir}/jemalloc.sh -%{_bindir}/jemalloc-config -%{_bindir}/jeprof -%{_mandir}/man*/* -%{_docdir}/%{name} +%_bindir/jemalloc.sh +%_bindir/jemalloc-config +%_bindir/jeprof +%_mandir/man*/* +%_docdir/%name -%files -n %{lname} +%files -n %lname %defattr(-,root,root) %doc ChangeLog COPYING README -%{_libdir}/libjemalloc.so.2* +%_libdir/libjemalloc.so.2* %files devel %defattr(-,root,root) -%{_includedir}/jemalloc -%{_libdir}/libjemalloc.so -%{_libdir}/pkgconfig/jemalloc.pc +%_includedir/jemalloc +%_libdir/libjemalloc.so +%_libdir/pkgconfig/jemalloc.pc %files devel-static %defattr(-,root,root) -%{_libdir}/libjemalloc*.a +%_libdir/libjemalloc*.a %changelog