From cfe493e29421a1f81945ffb6c9d1a9959681f7671fcf00ac954f5270f15fc081 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Thu, 7 Mar 2019 13:43:00 +0000 Subject: [PATCH] Accepting request 682435 from home:bmwiedemann:branches:Base:System override build date to make package build reproducible (boo#1047218) drop unreproducible perfevent_coverage program (boo#1040589) - not sure if it is needed for anything, but it is only in the testsuite the non-determinism seems to come via gcc -fprofile-arcs -ftest-coverage or --coverage -fbranch-probabilities params OBS-URL: https://build.opensuse.org/request/show/682435 OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=78 --- pcp.changes | 6 ++++++ pcp.spec | 3 +++ 2 files changed, 9 insertions(+) diff --git a/pcp.changes b/pcp.changes index c5aa9bb..c786d58 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 7 11:48:47 UTC 2019 - Bernhard Wiedemann + +- drop unreproducible perfevent_coverage program (boo#1040589) +- override build date to make package build reproducible (boo#1047218) + ------------------------------------------------------------------- Thu Feb 28 23:04:12 UTC 2019 - ddiss@suse.com diff --git a/pcp.spec b/pcp.spec index 449d79f..751f217 100644 --- a/pcp.spec +++ b/pcp.spec @@ -2129,6 +2129,7 @@ rm -Rf $RPM_BUILD_ROOT # in case we're building without os-release (bsc#1123311)... export PACKAGE_DISTRIBUTION="suse" %endif +export PACKAGE_BUILD_DATE=`date -u -r CHANGELOG +%Y-%m-%d` PCP_CFLAGS="$RPM_OPT_FLAGS" CFLAGS="$RPM_OPT_FLAGS" CCFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %configure \ --with-tmpdir=%{_tempsdir} \ --datarootdir=%{_datadir} \ @@ -2218,6 +2219,8 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/pmchart.desktop rm -fr $RPM_BUILD_ROOT/%{_pmdasdir}/lio %endif +rm -f $RPM_BUILD_ROOT/%{_localstatedir}/lib/pcp/testsuite/perfevent/perfevent_coverage # drop unreproducible file (boo#1040589) + %if 0%{?suse_version} rm -rf $RPM_BUILD_ROOT/%{_datadir}/pcp/webapps