diff --git a/booth.rpmlintrc b/booth.rpmlintrc index 14f5ed5..ae1945c 100644 --- a/booth.rpmlintrc +++ b/booth.rpmlintrc @@ -9,6 +9,9 @@ addFilter(r'booth-core\.[^:]+: (E|W): non-standard-dir-perm /var/lib/booth/cores # booth is just metapackage addFilter(r'booth\.[^:]+: (W|E): no-binary') +# pc should be in devel but it is not really devel file +addFilter(r'booth\.[^:]+: W: devel-file-in-non-devel-package /usr/share/pkgconfig/booth.pc') + # booth-(site|test) installs just scripts in /usr/lib addFilter(r'booth-(site|test)\.[^:]+: (W|E): only-non-binary-in-usr-lib') diff --git a/booth.spec b/booth.spec index c734653..a41218f 100644 --- a/booth.spec +++ b/booth.spec @@ -27,10 +27,10 @@ # 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 # `spectool -g booth.spec` to download source. -%global git_describe_str v1.0-237-gdd88847c8e7c55f18ace774cf70545aa137bd296 +%global git_describe_str v1.0-239-g52ec25539bc73fec37851bfe1eaa397251fa6487 # Set this to 1 when rebasing (changing git_describe_str) and increase otherwise -%global release 2 +%global release 1 # 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}) @@ -107,7 +107,9 @@ BuildRequires: perl-interpreter iproute Requires: %{name}-core%{?_isa} Requires: %{name}-site %files -# intentionally empty +%license COPYING +%dir %{_datadir}/pkgconfig +%{_datadir}/pkgconfig/booth.pc %description Booth manages tickets which authorize cluster sites located @@ -301,6 +303,9 @@ VERBOSE=1 make check %{_usr}/lib/ocf/resource.d/booth/sharedrsc %changelog +* Mon Nov 23 2020 Jan Friesse - 1.0-239.1.52ec255.git +- Rebase to newest upstream snapshot + * Thu Oct 15 2020 Jan Friesse - 1.0-237.2.dd88847.git - Fix dist macro diff --git a/sources b/sources index ad2c144..f18d89b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (booth-1.0-237-dd88847.tar.gz) = 889e67b3ce0d35800030f289eb9bca6d282ed75ab4def44910e35a1aa7b1bd9b1ccc65347222206542e1f7f49814a84e22e46dc004a0b19634a91954b0f89f88 +SHA512 (booth-1.0-239-52ec255.tar.gz) = 94242abc182c87d4ef748d972b1279d3a17a3011d52c3456c3e1e01e2581666138608a30c99e7e60dd2ba9d817804f2ca96475c21d7ac441996bbff2a7a104cc