Update memkind source file to 0.3.0 upstream

This commit is contained in:
Rafael Aquini 2015-11-17 08:09:11 -05:00
parent 9d31e6f381
commit 658deb927d

View File

@ -1,11 +1,12 @@
%global commit 35c83cee96432edc0b5b21680535a2f2b77a1801
%global commit2 8a46c970035ada0154f302418cb436de49606231
%global checkout .20150525git
# % global checkout .20150525git
# % global version0 35c83cee96432edc0b5b21680535a2f2b77a1801
# % global shortversion0 %(c=%{version0}; echo ${c:0:7})
%global gittag0 v0.3.0
Name: memkind
Summary: User Extensible Heap Manager
Version: 0.2.2
Release: 4%{?checkout}%{?dist}
Version: 0.3.0
Release: 1%{?checkout}%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://memkind.github.io/memkind
@ -22,14 +23,7 @@ BuildRequires: automake libtool numactl-devel
# - http://en.wikipedia.org/wiki/SSE4
ExclusiveArch: x86_64
# The two source tarballs for this package were pulled from upstream
Source0: https://github.com/%{name}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
Source1: https://github.com/%{name}/jemalloc/archive/%{commit2}/jemalloc-%{commit2}.tar.gz
# https://github.com/memkind/memkind/issues/3
Patch0: 0001-memkind-pmtt-stop-nuking-sysconfdir-and-contents.patch
# https://github.com/memkind/memkind/issues/4
Patch1: 0002-memkind-configure.ac-fix-obsolete-macro-usage-warnin.patch
Source0: https://github.com/%{name}/%{name}/archive/%{gittag0}/%{name}-%{version}.tar.gz
%description
The memkind library is an user extensible heap manager built on top of
@ -61,13 +55,7 @@ pre-alpha: bugs may exist and the interfaces may be subject to change prior to
alpha release. Feedback on design or implementation is greatly appreciated.
%prep
%setup -q -a 0 -n %{name}-%{commit}
%setup -q -a 1 -n %{name}-%{commit}
cd %{_builddir}/%{name}-%{commit}/
rmdir %{_builddir}/%{name}-%{commit}/jemalloc/
mv jemalloc-%{commit2}/ jemalloc/
%patch0 -p1 -b .patch0.bkp
%patch1 -p1 -b .patch1.bkp
%setup -q -a 0 -n %{name}-%{version}
%build
# It is required that we configure and build the jemalloc subdirectory
@ -75,13 +63,13 @@ mv jemalloc-%{commit2}/ jemalloc/
# To ensure the memkind build step is able to discover the output
# of the jemalloc build we must create an 'obj' directory, and build
# from within that directory.
cd %{_builddir}/%{name}-%{commit}/jemalloc/
echo %{version} > %{_builddir}/%{name}-%{commit}/jemalloc/VERSION
cd %{_builddir}/%{name}-%{version}/jemalloc/
echo %{version} > %{_builddir}/%{name}-%{version}/jemalloc/VERSION
test -f configure || %{__autoconf}
mkdir %{_builddir}/%{name}-%{commit}/jemalloc/obj
ln -s %{_builddir}/%{name}-%{commit}/jemalloc/configure \
%{_builddir}/%{name}-%{commit}/jemalloc/obj/
cd %{_builddir}/%{name}-%{commit}/jemalloc/obj
mkdir %{_builddir}/%{name}-%{version}/jemalloc/obj
ln -s %{_builddir}/%{name}-%{version}/jemalloc/configure \
%{_builddir}/%{name}-%{version}/jemalloc/obj/
cd %{_builddir}/%{name}-%{version}/jemalloc/obj
%configure --enable-autogen --with-jemalloc-prefix=jemk_ --enable-memkind \
--enable-safe --enable-cc-silence --prefix=%{_prefix} \
--includedir=%{_includedir} --libdir=%{_libdir} \
@ -90,9 +78,9 @@ cd %{_builddir}/%{name}-%{commit}/jemalloc/obj
%{__make} %{?_smp_mflags}
# Build memkind lib and tools
cd %{_builddir}/%{name}-%{commit}
echo %{version} > %{_builddir}/%{name}-%{commit}/VERSION
touch %{_builddir}/%{name}-%{commit}/jemalloc/.git
cd %{_builddir}/%{name}-%{version}
echo %{version} > %{_builddir}/%{name}-%{version}/VERSION
touch %{_builddir}/%{name}-%{version}/jemalloc/.git
test -f configure || ./autogen.sh
%configure --enable-tls --prefix=%{_prefix} --libdir=%{_libdir} \
--includedir=%{_includedir} --sbindir=%{_sbindir} \
@ -101,7 +89,7 @@ test -f configure || ./autogen.sh
%{__make} %{?_smp_mflags}
%install
cd %{_builddir}/%{name}-%{commit}
cd %{_builddir}/%{name}-%{version}
%{__make} DESTDIR=%{buildroot} install
mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
rm -f %{buildroot}/%{_libdir}/lib%{name}.{l,}a
@ -131,14 +119,17 @@ rm -f %{buildroot}/%{_docdir}/%{name}/VERSION
%{_mandir}/man3/%{name}*.3.*
%changelog
* Tue Nov 17 2015 Rafael Aquini <aquini@linux.com> - 0.3.0-1
- Update memkind source file to 0.3.0 upstream
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-4.20150525git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Mon May 25 2015 Rafael Aquini <aquini@linux.com> - 0.2.2-3%{?checkout}
* Mon May 25 2015 Rafael Aquini <aquini@linux.com> - 0.2.2-3.20150525git
- Get rid of obsolete m4 macros usage on autotool scripts
* Mon May 18 2015 Rafael Aquini <aquini@linux.com> - 0.2.2-2%{?checkout}
* Mon May 18 2015 Rafael Aquini <aquini@linux.com> - 0.2.2-2.20150525git
- Fix to BuildRequires and License Text Marker in spec file (1222709#c1)
* Mon May 18 2015 Rafael Aquini <aquini@linux.com> - 0.2.2-1%{?checkout}
* Mon May 18 2015 Rafael Aquini <aquini@linux.com> - 0.2.2-1.20150518git
- Initial RPM packaging for Fedora