rpms/booth
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Rebase to newest upstream snapshot

Browse Source 
- Resolves: rhbz#1961216

- Do not include unit-test by default
- Rebase to newest upstream snapshot
This commit is contained in:
Jan Friesse 2021-05-18 08:48:32 +02:00
parent 6caac2fdf3
commit a14b4bc843
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
booth.spec
View File

@ -22,15 +22,16 @@
%bcond_with html_man %bcond_with html_man
%bcond_with glue %bcond_with glue
%bcond_with run_build_tests %bcond_with run_build_tests
%bcond_with include_unit_test
# set following to the result of `git describe --abbrev=128 $commit` # set following to the result of `git describe --abbrev=128 $commit`
# This will be used to fill booth_ver, booth_numcomm and booth_sha1. # This will be used to fill booth_ver, booth_numcomm and booth_sha1.
# It is important to keep abbrev to get full length sha1! When updating source use # It is important to keep abbrev to get full length sha1! When updating source use
# `spectool -g booth.spec` to download source. # `spectool -g booth.spec` to download source.
%global git_describe_str v1.0-239-g52ec25539bc73fec37851bfe1eaa397251fa6487 %global git_describe_str v1.0-249-g977726e673b582cf609b352d80affba0480b22e4
# Set this to 1 when rebasing (changing git_describe_str) and increase otherwise # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise
%global release 3 %global release 1
# Run shell script to parse git_describe str into version, numcomm and sha1 hash # Run shell script to parse git_describe str into version, numcomm and sha1 hash
%global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1}) %global booth_ver %(s=%{git_describe_str}; vver=${s%%%%-*}; echo ${vver:1})
@ -179,7 +180,9 @@ Requires: %{name}-arbitrator = %{version}-%{release}
Requires: %{name}-site = %{version}-%{release} Requires: %{name}-site = %{version}-%{release}
Requires: gdb Requires: gdb
Requires: %{__python3} Requires: %{__python3}
%if 0%{?with_include_unit_test}
Requires: python3-pexpect Requires: python3-pexpect
%endif
# runtests.py suite (for perl and ss) # runtests.py suite (for perl and ss)
Requires: perl-interpreter iproute Requires: perl-interpreter iproute
@ -220,7 +223,11 @@ rm -rf %{buildroot}/%{_pkgdocdir}/COPYING
mkdir -p %{buildroot}/%{test_path} mkdir -p %{buildroot}/%{test_path}
# Copy tests from tarball # Copy tests from tarball
cp -a -t %{buildroot}/%{test_path} \ cp -a -t %{buildroot}/%{test_path} \
-- conf test unit-tests script/unit-test.py -- conf test
%if 0%{?with_include_unit_test}
cp -a -t %{buildroot}/%{test_path} \
-- unit-tests script/unit-test.py
%endif
chmod +x %{buildroot}/%{test_path}/test/booth_path chmod +x %{buildroot}/%{test_path}/test/booth_path
chmod +x %{buildroot}/%{test_path}/test/live_test.sh chmod +x %{buildroot}/%{test_path}/test/live_test.sh
mkdir -p %{buildroot}/%{test_path}/src mkdir -p %{buildroot}/%{test_path}/src
@ -303,6 +310,12 @@ VERBOSE=1 make check
%{_usr}/lib/ocf/resource.d/booth/sharedrsc %{_usr}/lib/ocf/resource.d/booth/sharedrsc
%changelog %changelog
* Tue May 18 2021 Jan Friesse <jfriesse@redhat.com> - 1.0-249.1.977726e.git
- Resolves: rhbz#1961216
- Do not include unit-test by default
- Rebase to newest upstream snapshot
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-239.3.52ec255.git * Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.0-239.3.52ec255.git
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

2
sources
View File

@ -1 +1 @@
SHA512 (booth-1.0-239-52ec255.tar.gz) = 94242abc182c87d4ef748d972b1279d3a17a3011d52c3456c3e1e01e2581666138608a30c99e7e60dd2ba9d817804f2ca96475c21d7ac441996bbff2a7a104cc SHA512 (booth-1.0-249-977726e.tar.gz) = d56768ef11d4250d8663d31d4bb4e1a8173683e37e50f53e27bc80389bb31962e1ba1733f465f988153064dff22c67a0375930c576fbe27b91213ee09803930c