From e7ed17846e3b7b2615e5ac502c4b980e6c279300 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 21 Sep 2017 13:39:01 +0100
Subject: [PATCH] Rebased to annobin-2.3 sources. Add annobin-tests subpackage
 containing some preliminary tests. Remove link-time test for unsuported
 targets.

---
 .gitignore   |  3 +++
 annobin.spec | 38 +++++++++++++++++++++++++++++++++-----
 sources      |  2 +-
 3 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index ccb1674..885a40c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 /annobin-2.0.tar.xz
+/annobin-2.1.tar.xz
+/annobin-2.2.tar.xz
+/annobin-2.3.tar.lz
diff --git a/annobin.spec b/annobin.spec
index 2c9dfaa..d9a227a 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,13 +1,17 @@
 Name:    annobin
 Summary: Binary annotation plugin for GCC
-Version: 2.0
+Version: 2.3
 Release: 1%{?dist}
 
 License: GPLv3, MIT/X11 (config/libcutl.m4, install-sh)
 Group:   Development/Tools
 URL:     https://fedoraproject.org/wiki/Toolchain/Watermark
 
-Source:  https://nickc.fedorapeople.org/annobin-2.0.tar.xz
+# Use "--without tests" to disable the testsuite.  The default is to run them.
+%bcond_without tests
+
+#---------------------------------------------------------------------------------
+Source:  https://nickc.fedorapeople.org/annobin-%{version}.tar.lz
 
 # This is a gcc plugin, hence gcc is required.
 Requires: gcc
@@ -19,15 +23,33 @@ A plugin for GCC that records extra information in the files that it compiles.
 This information can be used to analyze the files, and provide the loader
 with extra information about the requirements of the loaded file.
 
+#---------------------------------------------------------------------------------
+%if %{with tests}
+
+%package tests
+Summary: Test scripts and binaries for checking the behaviour and output of the annobin plugin
+
+%description tests
+Provides a means to test the generation of annotated binaries and the parsing
+of the resulting files.
+# FIXME: Does not actually do this yet...
+
+%endif
+#---------------------------------------------------------------------------------
+
 %global ANNOBIN_PLUGIN_DIR %(g++ -print-file-name=plugin)
 
 %prep
 %autosetup -p1
 
 %build
-%configure
+%configure --quiet
 make %{?_smp_mflags}
 
+%if %{with tests}
+make check
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -42,8 +64,14 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %exclude %{_datadir}/doc/annobin-plugin/LICENSE
 %doc %{_datadir}/doc/annobin-plugin/annotation.proposal.txt
 
+#---------------------------------------------------------------------------------
+
 %changelog
-* Wed Jun 28 2017 Nick Clifton <nickc@redhat.com> - annobin-2.0-1.fc25
+* Thu Sep 21 2017 Nick Clifton <nickc@redhat.com> - annobin-2.3-1
+- Add annobin-tests subpackage containing some preliminary tests.
+- Remove link-time test for unsuported targets.
+
+* Wed Jun 28 2017 Nick Clifton <nickc@redhat.com> - annobin-2.0-1
 - Fixes for problems reported by the package submission review:
    * Add %%license entry to %%file section.
    * Update License and BuildRequires tags.
@@ -53,5 +81,5 @@ make install DESTDIR=$RPM_BUILD_ROOT
    * Clean up the %%changelog.
 - Update to use version 2 of the specification and sources.
 
-* Thu May 11 2017 Nick Clifton <nickc@redhat.com> - annobin-1.0-1.fc25
+* Thu May 11 2017 Nick Clifton <nickc@redhat.com> - annobin-1.0-1
 - Initial submission.
diff --git a/sources b/sources
index a970591..98d5d2a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-2.0.tar.xz) = faf8eb834b74352f684a8eac9f90cfbb5ec0ecc20d4618f388ac31ff194369820455b88203d42398e1a39e0f44e3e5991e6777f606a2c1340ef7e276e3985ba4
+SHA512 (annobin-2.3.tar.lz) = a7dc6d08fc87314c95be0b1fdd58fe3e66d79273235b5b778b5e33a8c88d91efe83e84c6393559f3e86d3d3d097cb85c85c8c7e1efc040e77559eefc11e5821f