diff --git a/.gitignore b/.gitignore index 04e53e3..d2441c3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ userspace-rcu-0.4.1.tar.bz2 /userspace-rcu-0.8.1.tar.bz2 /userspace-rcu-0.8.5.tar.bz2 /userspace-rcu-0.8.6.tar.bz2 +/userspace-rcu-0.9.2.tar.bz2 diff --git a/sources b/sources index 43186fe..92e194f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -834d91d939dd55108a05763be9879856 userspace-rcu-0.8.6.tar.bz2 +49f86e68c1e2f41d303381a271b791d1 userspace-rcu-0.9.2.tar.bz2 diff --git a/userspace-rcu-aarch64.patch b/userspace-rcu-aarch64.patch deleted file mode 100644 index d6bc574..0000000 --- a/userspace-rcu-aarch64.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Dimitri John Ledkov -Date: Wed, 12 Mar 2014 12:17:51 +0000 (-0400) -Subject: Use gcc atomics on aarch64/powerpc64le -X-Git-Url: http://git.lttng.org/?p=userspace-rcu.git;a=commitdiff_plain;h=3913336f0e763b4ab614aa6b6e41e20b481e50c3 - -Use gcc atomics on aarch64/powerpc64le - -Currently there are two fairly recent architectures, which at the -moment can only be compiled with "gcc atomics" code path. -The two new architectures are (GNU Types): -* aarch64-linux-gnu (aka ARMv8, ARM64, AARCH64, etc) -* powerpc64le-linux-gnu - -Signed-off-by: Mathieu Desnoyers ---- - -diff --git a/configure.ac b/configure.ac -index 079c145..3368b33 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -69,6 +69,7 @@ AS_CASE([$host_cpu], - [powerpc], [ARCHTYPE="ppc"], - [ppc64], [ARCHTYPE="ppc"], - [powerpc64], [ARCHTYPE="ppc"], -+ [powerpc64le], [ARCHTYPE="gcc"], - [ppc], [ARCHTYPE="ppc"], - [s390], [ARCHTYPE="s390"], - [s390x], [ARCHTYPE="s390"], -@@ -77,6 +78,7 @@ AS_CASE([$host_cpu], - [alpha*], [ARCHTYPE="alpha"], - [ia64], [ARCHTYPE="gcc"], - [arm*], [ARCHTYPE="arm"], -+ [aarch64], [ARCHTYPE="gcc"], - [mips*], [ARCHTYPE="mips"], - [tile*], [ARCHTYPE="gcc"], - [ARCHTYPE="unknown"] diff --git a/userspace-rcu.spec b/userspace-rcu.spec index 2e75fca..6f9b096 100644 --- a/userspace-rcu.spec +++ b/userspace-rcu.spec @@ -1,17 +1,14 @@ Name: userspace-rcu -Version: 0.8.6 -Release: 4%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: RCU (read-copy-update) implementation in user space Group: System Environment/Libraries License: LGPLv2+ -URL: http://lttng.org/urcu/ +URL: http://liburcu.org Source0: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2 -Patch0: userspace-rcu-aarch64.patch -BuildRequires: autoconf automake libtool -BuildRequires: pkgconfig -# Upstream do not yet support mips -ExcludeArch: mips +BuildRequires: pkgconfig +BuildRequires: perl-Test-Harness %description This data synchronization library provides read-side access which scales @@ -32,17 +29,10 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 %build -# Patch for AArch64 and PPC64LE needs it -autoreconf -vif %configure --disable-static -#Remove Rpath from build system -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool - V=1 make %{?_smp_mflags} @@ -52,16 +42,14 @@ rm -vf $RPM_BUILD_ROOT%{_libdir}/*.la %check -#TODO greenscientist: make check currently fail in mockbuild -#make check +make check %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files -%doc ChangeLog LICENSE README gpl-2.0.txt lgpl-relicensing.txt lgpl-2.1.txt +%doc ChangeLog LICENSE README.md gpl-2.0.txt lgpl-relicensing.txt lgpl-2.1.txt %{_libdir}/*.so.* %files devel @@ -69,11 +57,16 @@ rm -vf $RPM_BUILD_ROOT%{_libdir}/*.la %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/liburcu*.pc -%{_docdir}/%{name}/README -%{_docdir}/%{name}/*.txt +%{_docdir}/%{name}/cds-api.md +%{_docdir}/%{name}/rcu-api.md +%{_docdir}/%{name}/uatomic-api.md %changelog +* Tue Jun 21 2016 Michael Jeanson - 0.9.2-1 +- New upstream release +- Dropped aarch64 patch merged upstream + * Sun May 15 2016 Yaakov Selkowitz - 0.8.6-4 - Fix %%doc usage (#1001239)