Improve handling of tool versions
This commit is contained in:
parent
2bb2ec5d78
commit
8749815a76
14
annobin.spec
14
annobin.spec
@ -1,8 +1,8 @@
|
|||||||
|
|
||||||
Name: annobin
|
Name: annobin
|
||||||
Summary: Annotate and examine compiled binary files
|
Summary: Annotate and examine compiled binary files
|
||||||
Version: 10.98
|
Version: 10.99
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: https://sourceware.org/annobin/
|
URL: https://sourceware.org/annobin/
|
||||||
# Maintainer: nickc@redhat.com
|
# Maintainer: nickc@redhat.com
|
||||||
@ -396,10 +396,11 @@ cp gcc-plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so
|
|||||||
make -C gcc-plugin clean
|
make -C gcc-plugin clean
|
||||||
BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so"
|
BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so"
|
||||||
|
|
||||||
%if 0%{?_annotated_build} == 0
|
# Disable the standard annobin plugin so that we do get conflicts.
|
||||||
OPTS="$(rpm --eval '%build_cflags %build_ldflags')"
|
# Note - Fedora's rpm uses a different way of evaluating macros.
|
||||||
|
%if 0%{?fedora} == 0
|
||||||
|
OPTS="$(rpm --eval '%undefine _annotated_build %build_cflags %build_ldflags')"
|
||||||
%else
|
%else
|
||||||
# Disable the standard annobin plugin so that we do not get conflicts.
|
|
||||||
OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')"
|
OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -513,6 +514,9 @@ fi
|
|||||||
#---------------------------------------------------------------------------------
|
#---------------------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Dec 21 2022 Nick Clifton <nickc@redhat.com> - 10.99-1
|
||||||
|
- Annocheck: Improve handling of tool versions.
|
||||||
|
|
||||||
* Tue Dec 20 2022 Nick Clifton <nickc@redhat.com> - 10.98-3
|
* Tue Dec 20 2022 Nick Clifton <nickc@redhat.com> - 10.98-3
|
||||||
- Spec File: Fix building with plugin_rebuild enabled.
|
- Spec File: Fix building with plugin_rebuild enabled.
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (annobin-10.98.tar.xz) = 523651275dd99e45d1611acdb1196948de034354730d07d7d5fe1f8946647b296532bcef1a3f1d18b7759a7bdf1c33c7574b3073eb7682696527ab67da95caa2
|
SHA512 (annobin-10.99.tar.xz) = 601bd90aa4b6528f595efebf5b864aae5176e8e9d80c7f9cf77a1252b85a15c8440866a1f4881176f6bb50418c037e8924f32456533e90de473dae8abe92d53e
|
||||||
|
Loading…
Reference in New Issue
Block a user