diff --git a/.gitignore b/.gitignore index 1574182..cd5475c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -SOURCES/userspace-rcu-0.10.1.tar.bz2 +gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg +userspace-rcu-0.14.0.tar.bz2 diff --git a/.userspace-rcu.metadata b/.userspace-rcu.metadata deleted file mode 100644 index 856c22c..0000000 --- a/.userspace-rcu.metadata +++ /dev/null @@ -1 +0,0 @@ -32755b4e99306fca50ededf2e4b8ef987813696c SOURCES/userspace-rcu-0.10.1.tar.bz2 diff --git a/SOURCES/regtest-without-bench.patch b/SOURCES/regtest-without-bench.patch deleted file mode 100644 index 8c29b9d..0000000 --- a/SOURCES/regtest-without-bench.patch +++ /dev/null @@ -1,26 +0,0 @@ -Remove the benchmarks from the regtest target, they timeout on the buildds. - ---- 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 diff --git a/regtest-without-bench.patch b/regtest-without-bench.patch new file mode 100644 index 0000000..8497367 --- /dev/null +++ b/regtest-without-bench.patch @@ -0,0 +1,12 @@ +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 @@ + 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 new file mode 100644 index 0000000..50fde22 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg) = 6c6b9ebdbd73cbfbffd0278ba3070a001fb3e200ead163e133e7eddd6b236ca5bfc09db30ec79c5315b488d03bf58faeb7f53251d43f907ad44aad28b762a32b +SHA512 (userspace-rcu-0.14.0.tar.bz2) = 7297e51012f4c44ee27c0e18ed9d87bf24be34db68a5398394c1e683a045bb561cf74aa913398404c0ed5cb8011af728ea12947717fa5f27627e5ca78e63a40f diff --git a/userspace-rcu-0.14.0.tar.bz2.asc b/userspace-rcu-0.14.0.tar.bz2.asc new file mode 100644 index 0000000..f854c7e --- /dev/null +++ b/userspace-rcu-0.14.0.tar.bz2.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEKgtO2RXy0/pF9bFiFygKl4EYas8FAmPrrAkACgkQFygKl4EY +as8G6QgAsvua4n/lXSqR1NdwPNRzbdSOI+x+UIlBpsDIEC0YT6xtUQIDRWuHlwFe +2vHpZ42ivKc3cqB3l4VuLxuZ8F67Ev8w448dkriy73nBbUIzJ9fmD2I3uR5ayW5I +Q+tXUFrYpUulkX6ff+LyxnJ1X34sIuiSjrxo/dvXqZ68PZnIUmtcR4DLhLga6o+x +mWYLcTaqx9VJLUdBC/dSJFT+tPfKF53J2oRYXo8yDN803djsLnDD+KXLpyuev48z +SBOvm2Nf/K8pmRRveqYCdXfKiXhN39lVyYkXLHQLnEH74qdNnBiwTOroSnzYk6jI +4ntfF/SN7Cj/C3hGTd9unLOP7plhlw== +=l+j1 +-----END PGP SIGNATURE----- diff --git a/SPECS/userspace-rcu.spec b/userspace-rcu.spec similarity index 52% rename from SPECS/userspace-rcu.spec rename to userspace-rcu.spec index 8866a90..7221239 100644 --- a/SPECS/userspace-rcu.spec +++ b/userspace-rcu.spec @@ -1,17 +1,23 @@ Name: userspace-rcu -Version: 0.10.1 -Release: 4%{?dist} +Version: 0.14.0 +Release: 7%{?dist} Summary: RCU (read-copy-update) implementation in user-space - -Group: System Environment/Libraries -License: LGPLv2+ +License: LGPL-2.1-or-later URL: http://liburcu.org + Source0: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2 +Source1: http://lttng.org/files/urcu/%{name}-%{version}.tar.bz2.asc +# gpg2 --export --export-options export-minimal 2A0B4ED915F2D3FA45F5B16217280A9781186ACF > gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg +Source2: gpgkey-2A0B4ED915F2D3FA45F5B16217280A9781186ACF.gpg Patch0: regtest-without-bench.patch -BuildRequires: pkgconfig -BuildRequires: perl-Test-Harness -BuildRequires: autoconf automake libtool +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: make BuildRequires: multilib-rpm-config +BuildRequires: pkgconfig %description This data synchronization library provides read-side access which scales @@ -22,21 +28,19 @@ reclamation is possible. %package devel Summary: Development files for %{name} -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel -The %{name}-devel package contains libraries and header files for -developing applications that use %{name}. +This package contains libraries and header files for developing applications +that use %{name} %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build # Reinitialize libtool with the fedora version to remove Rpath -autoreconf -vif +autoreconf -vif -W all,error %configure --disable-static V=1 make %{?_smp_mflags} @@ -44,27 +48,43 @@ V=1 make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -rm -vf $RPM_BUILD_ROOT%{_libdir}/*.la +find %{buildroot} -type f -name "*.la" -delete +rm %{buildroot}/%{_docdir}/%{name}/LICENSE # 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 %check make check make regtest -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%doc ChangeLog LICENSE README.md gpl-2.0.txt lgpl-relicensing.txt lgpl-2.1.txt -%{_libdir}/*.so.* +%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-signal.so.8* +%{_libdir}/liburcu.so.8* %files devel %doc %{_pkgdocdir}/examples %{_includedir}/* -%{_libdir}/*.so +%{_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-signal.so +%{_libdir}/liburcu.so %{_libdir}/pkgconfig/liburcu*.pc %{_docdir}/%{name}/cds-api.md %{_docdir}/%{name}/rcu-api.md @@ -73,15 +93,85 @@ make regtest %changelog -* Wed Feb 10 2021 Benjamin Marzinski - 0.10.1-4 -- Fix CI test package requirements -- Resolves: bz #1682555 +* Tue Oct 29 2024 Troy Dawson - 0.14.0-7 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Fri Oct 04 2019 Benjamin Marzinski - 0.10.1-3 -- Replace arch-dependent /usr/include/urcu/config.h with arch-independent - stub when needed. (bz #1853168) -- Added CI gating tests (bz #1682555) -- Resolves: bz #1682555, #1853168 +* Thu Jun 27 2024 Benjamin Marzinski - 0.14.0-6 +- Add OSCI tests and gating.yaml + +* Mon Jun 24 2024 Troy Dawson - 0.14.0-5 +- Bump release for June 2024 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 + +* Sat Jul 14 2018 Fedora Release Engineering - 0.10.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu May 10 2018 Peter Robinson 0.10.1-3 +- Use %%license, spec cleanups * Fri Feb 09 2018 Fedora Release Engineering - 0.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild