diff --git a/.gitignore b/.gitignore index a135c37..76414f8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,32 +11,3 @@ userspace-rcu-0.4.1.tar.bz2 /userspace-rcu-0.9.3.tar.bz2 /userspace-rcu-0.10.0.tar.bz2 /userspace-rcu-0.10.1.tar.bz2 -/userspace-rcu-0.10.2.tar.bz2 -/userspace-rcu-0.11.0.tar.bz2 -/userspace-rcu-0.11.1.tar.bz2 -/userspace-rcu-0.12.0.tar.bz2 -/userspace-rcu-0.12.1.tar.bz2 -/userspace-rcu-0.12.2.tar.bz2 -/userspace-rcu-0.12.2.tar.bz2.asc -/userspace-rcu-0.13.0.tar.bz2 -/userspace-rcu-0.13.0.tar.bz2.asc -/userspace-rcu-0.13.2.tar.bz2 -/userspace-rcu-0.13.2.tar.bz2.asc -/userspace-rcu-0.14.0.tar.bz2 -/userspace-rcu-0.14.0.tar.bz2.asc -/userspace-rcu-0.14.1.tar.bz2 -/userspace-rcu-0.14.1.tar.bz2.asc -/userspace-rcu-0.15.0.tar.bz2 -/userspace-rcu-0.15.0.tar.bz2.asc -/userspace-rcu-0.15.1.tar.bz2 -/userspace-rcu-0.15.1.tar.bz2.asc -/userspace-rcu-0.15.2.tar.bz2 -/userspace-rcu-0.15.2.tar.bz2.asc -/userspace-rcu-0.15.3.tar.bz2 -/userspace-rcu-0.15.3.tar.bz2.asc -/userspace-rcu-0.15.4.tar.bz2 -/userspace-rcu-0.15.4.tar.bz2.asc -/userspace-rcu-0.15.5.tar.bz2 -/userspace-rcu-0.15.5.tar.bz2.asc -/userspace-rcu-0.15.6.tar.bz2 -/userspace-rcu-0.15.6.tar.bz2.asc diff --git a/gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg b/gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg deleted file mode 100644 index 93013f5..0000000 Binary files a/gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg and /dev/null differ diff --git a/regtest-without-bench.patch b/regtest-without-bench.patch index 8497367..8c29b9d 100644 --- a/regtest-without-bench.patch +++ b/regtest-without-bench.patch @@ -1,12 +1,26 @@ Remove the benchmarks from the regtest target, they timeout on the buildds. ---- a/tests/Makefile.am.orig 2019-06-03 15:46:16.380163423 -0400 -+++ b/tests/Makefile.am 2019-06-03 15:46:26.099004417 -0400 -@@ -8,7 +8,6 @@ +--- a/tests/benchmark/Makefile.am ++++ b/tests/benchmark/Makefile.am +@@ -229,13 +229,10 @@ + done; \ + fi + +-.PHONY: short_bench long_bench regtest ++.PHONY: short_bench long_bench + + short_bench: + ./run.sh short_bench_tests + + long_bench: + ./run.sh long_bench_tests +- +-regtest: +- ./run.sh regression_tests +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -8,4 +8,3 @@ cd benchmark && $(MAKE) $(AM_MAKEFLAGS) long_bench regtest: cd regression && $(MAKE) $(AM_MAKEFLAGS) regtest - cd benchmark && $(MAKE) $(AM_MAKEFLAGS) regtest - - check-loop: - while [ 0 ]; do \ diff --git a/sources b/sources index 18cd228..c2b8378 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (userspace-rcu-0.15.6.tar.bz2) = 53c28821dabfc1e8803c4299f6a9e589c9949d0062dd8aaa4aabb6d77641dfbd2b2c035c50680991d9f228499c12b9b23469044726a6ffce5e84f21f17cabff3 -SHA512 (userspace-rcu-0.15.6.tar.bz2.asc) = cd1b0fac74c01ef82d6e09a909b65026ccccec9b7bf042ec38783631c6a9e99993b570b2200ba814303483c99aaa44dc6ac2e58d7cd24ee5e5027becff724ff0 +SHA512 (userspace-rcu-0.10.1.tar.bz2) = 2bb042e1cf8888eab664ea6e88b94646c995bea61c89d49dcf4e844d144329303c600d73e29e0f05c935ad8278857cc08fb5b4b9f7f0c2f120c46b458b51a211 diff --git a/userspace-rcu.spec b/userspace-rcu.spec index df6ede8..f325a23 100644 --- a/userspace-rcu.spec +++ b/userspace-rcu.spec @@ -1,23 +1,15 @@ Name: userspace-rcu -Version: 0.15.6 -Release: 2%{?dist} +Version: 0.10.1 +Release: 5%{?dist} Summary: RCU (read-copy-update) implementation in user-space -License: LGPL-2.1-or-later -URL: https://liburcu.org +License: LGPLv2+ +URL: http://liburcu.org -Source0: https://lttng.org/files/urcu/%{name}-%{version}.tar.bz2 -Source1: https://lttng.org/files/urcu/%{name}-%{version}.tar.bz2.asc -# gpg2 --export --export-options export-minimal 2A0B4ED915F2D3FA45F5B16217280A9781186ACF > gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg -Source2: gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg +Source0: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2 Patch0: regtest-without-bench.patch -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gcc -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: make -BuildRequires: multilib-rpm-config BuildRequires: pkgconfig +BuildRequires: perl-Test-Harness +BuildRequires: autoconf automake libtool %description This data synchronization library provides read-side access which scales @@ -36,24 +28,21 @@ that use %{name} %prep -%autosetup -p1 +%setup -q +%patch0 -p1 %build # Reinitialize libtool with the fedora version to remove Rpath -autoreconf -vif -W all,error +autoreconf -vif -%configure --disable-static --enable-compiler-atomic-builtins +%configure --disable-static V=1 make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT find %{buildroot} -type f -name "*.la" -delete -rm %{buildroot}/%{_docdir}/%{name}/LICENSE.md -# Replace arch-dependent header file with arch-independent stub (when needed). -%multilib_fix_c_header --file %{_includedir}/urcu/config.h -%multilib_fix_c_header --file %{_includedir}/urcu/arch.h -%multilib_fix_c_header --file %{_includedir}/urcu/uatomic.h +rm %{buildroot}/%{_docdir}/%{name}/LICENSE %check make check @@ -63,26 +52,14 @@ make regtest %files -%license LICENSE.md lgpl-relicensing.md +%license LICENSE gpl-2.0.txt lgpl-relicensing.txt lgpl-2.1.txt %doc ChangeLog README.md -%{_libdir}/liburcu-bp.so.8* -%{_libdir}/liburcu-cds.so.8* -%{_libdir}/liburcu-common.so.8* -%{_libdir}/liburcu-mb.so.8* -%{_libdir}/liburcu-memb.so.8* -%{_libdir}/liburcu-qsbr.so.8* -%{_libdir}/liburcu.so.8* +%{_libdir}/*.so.* %files devel %doc %{_pkgdocdir}/examples %{_includedir}/* -%{_libdir}/liburcu-bp.so -%{_libdir}/liburcu-cds.so -%{_libdir}/liburcu-common.so -%{_libdir}/liburcu-mb.so -%{_libdir}/liburcu-memb.so -%{_libdir}/liburcu-qsbr.so -%{_libdir}/liburcu.so +%{_libdir}/*.so %{_libdir}/pkgconfig/liburcu*.pc %{_docdir}/%{name}/cds-api.md %{_docdir}/%{name}/rcu-api.md @@ -91,105 +68,6 @@ make regtest %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.15.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Fri Jan 30 2026 Michael Jeanson - 0.15.6-1 -- New upstream release - -* Sat Jan 17 2026 Fedora Release Engineering - 0.15.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Nov 12 2025 Michael Jeanson - 0.15.5-1 -- New upstream release - -* Mon Nov 10 2025 Michael Jeanson - 0.15.4-1 -- New upstream release - -* Fri Jul 25 2025 Fedora Release Engineering - 0.15.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue May 20 2025 Michael Jeanson - 0.15.3-1 -- New upstream release - -* Tue Apr 15 2025 Michael Jeanson - 0.15.2-1 -- New upstream release - -* Tue Feb 18 2025 Michael Jeanson - 0.15.1-1 -- New upstream release - -* Thu Jan 16 2025 Michael Jeanson - 0.15.0-1 -- New upstream release -- The 'signal' flavour of liburcu was removed upstream -- Enable compiler atomics - -* Tue Sep 03 2024 Kienan Stewart - 0.14.1-1 -- New upstream release - -* Sat Jul 20 2024 Fedora Release Engineering - 0.14.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 0.14.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 0.14.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Mon May 08 2023 Michael Jeanson - 0.14.0-2 -- migrated to SPDX license - -* Thu Apr 27 2023 Michael Jeanson - 0.14.0-1 -- New upstream release - -* Sat Jan 21 2023 Fedora Release Engineering - 0.13.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Oct 28 2022 Michael Jeanson - 0.13.2-1 -- New upstream release - -* Sat Jul 23 2022 Fedora Release Engineering - 0.13.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 0.13.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 0.13.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Michael Jeanson - 0.13.0-2 -- New upstream release -- Bump SONAME to 8 - -* Thu Feb 18 2021 Michael Jeanson - 0.12.2-1 -- New upstream release - -* Wed Feb 17 2021 Michael Jeanson - 0.12.1-4 -- Fix conflicts in userspace-rcu-devel multilib packages (#1886615) - -* Wed Jan 27 2021 Fedora Release Engineering - 0.12.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 0.12.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Apr 22 2020 Michael Jeanson - 0.12.1-1 -- New upstream release - -* Tue Apr 14 2020 Michael Jeanson - 0.12.0-1 -- New upstream release - -* Fri Jan 31 2020 Fedora Release Engineering - 0.11.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 0.11.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Mon Jun 03 2019 Michael Jeanson - 0.11.1-1 -- New upstream release - -* Fri May 03 2019 Michael Jeanson - 0.10.2-1 -- New upstream release - * Sun Feb 03 2019 Fedora Release Engineering - 0.10.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild