Hello community, here is the log from the commit of package mtr for openSUSE:Factory checked in at 2017-04-20 20:58:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mtr (Old) and /work/SRC/openSUSE:Factory/.mtr.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mtr" Thu Apr 20 20:58:54 2017 rev:35 rq:489314 version:0.87 Changes: -------- --- /work/SRC/openSUSE:Factory/mtr/mtr.changes 2016-12-13 19:33:40.308152123 +0100 +++ /work/SRC/openSUSE:Factory/.mtr.new/mtr.changes 2017-04-20 20:58:56.540151811 +0200 @@ -1,0 +2,8 @@ +Thu Apr 13 14:47:04 UTC 2017 - [email protected] + +- add mtr-0.87-dont_copy_makefile.patch in order not to overwrite + generated Makefile with the Makefile.dist in distclean if the + second build runs less than 3 seconds. This causes build to fail + [bsc#1020147] + +------------------------------------------------------------------- New: ---- mtr-0.87-dont_copy_makefile.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mtr.spec ++++++ --- /var/tmp/diff_new_pack.ZOZo3O/_old 2017-04-20 20:58:57.204057920 +0200 +++ /var/tmp/diff_new_pack.ZOZo3O/_new 2017-04-20 20:58:57.208057354 +0200 @@ -1,7 +1,7 @@ # # spec file for package mtr # -# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,6 +29,7 @@ Patch2: mtr-0.87-manxmtr.patch Patch4: mtr-0.75-sec_snprintf.patch Patch5: mtr-0.87-capabilities.patch +Patch6: mtr-0.87-dont_copy_makefile.patch BuildRequires: automake BuildRequires: gtk2-devel BuildRequires: libcap-devel @@ -63,6 +64,7 @@ %patch2 %patch4 %patch5 -p1 +%patch6 -p1 %build autoreconf -vi ++++++ mtr-0.87-dont_copy_makefile.patch ++++++ >From 119a0e33ee6a023f32b256b8bafa5f972ecc480f Mon Sep 17 00:00:00 2001 From: Michal Sekletar <[email protected]> Date: Tue, 28 Feb 2017 12:29:55 +0100 Subject: [PATCH] Don't copy Makefile.dist to Makefile in distclean Note that make doesn't wait for this background task to finish. During rpm build we are building mtr twice. After first build we call distclean. If second invocation of configure script runs in less than 3 seconds then the Makefile generated by configure will be overwritten by background copy. We don't want that and since we are calling configure explicitly we don't really need this "feature" at all. --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index fa9a2dd..adf43c0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,6 @@ version.h: version.h.tmp Makefile $(mtr_SOURCES) EXTRA_DIST = SECURITY mtr.8 Makefile Makefile.dist distclean-local: - (sleep 3; cp Makefile.dist Makefile) & rm -f *.orig DISTCLEANFILES = *~ -- 2.9.3
