Hello community, here is the log from the commit of package clusterssh for openSUSE:Factory checked in at 2018-03-05 13:42:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clusterssh (Old) and /work/SRC/openSUSE:Factory/.clusterssh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clusterssh" Mon Mar 5 13:42:55 2018 rev:9 rq:582218 version:4.07 Changes: -------- --- /work/SRC/openSUSE:Factory/clusterssh/clusterssh.changes 2017-03-13 15:32:05.910020456 +0100 +++ /work/SRC/openSUSE:Factory/.clusterssh.new/clusterssh.changes 2018-03-05 13:44:11.730182340 +0100 @@ -1,0 +2,6 @@ +Sat Mar 3 13:36:02 UTC 2018 - bwiedem...@suse.com + +- Add clusterssh-fix-docgen.patch to fix doc generation race + (boo#1083835) + +------------------------------------------------------------------- New: ---- clusterssh-fix-docgen.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clusterssh.spec ++++++ --- /var/tmp/diff_new_pack.aRwWeY/_old 2018-03-05 13:44:13.006136167 +0100 +++ /var/tmp/diff_new_pack.aRwWeY/_new 2018-03-05 13:44:13.010136023 +0100 @@ -1,7 +1,7 @@ # # spec file for package clusterssh # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -22,14 +22,14 @@ %define modname App-ClusterSSH %define dullver 4.07 Summary: Multiplex SSH sessions onto many hosts using multiple terminals -License: GPL-1.0+ or Artistic-1.0 +License: GPL-1.0-or-later OR Artistic-1.0 Group: Productivity/Networking/SSH Url: http://clusterssh.sf.net/ #Git-Clone: git://clusterssh.git.sf.net/gitroot/clusterssh/clusterssh Source: http://downloads.sf.net/clusterssh/App-ClusterSSH-4.07.tar.gz Source2: %name-rpmlintrc -#Patch1: remove-time-key.patch +Patch1: clusterssh-fix-docgen.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: fdupes @@ -106,11 +106,11 @@ %prep %setup -qn %modname-%dullver -#%patch -P 1 -p1 +%patch -P 1 -p1 %build -perl Makefile.PL; -make %{?_smp_mflags}; +perl Makefile.PL +make %{?_smp_mflags} %install %perl_make_install ++++++ clusterssh-fix-docgen.patch ++++++ Author: Bernhard M. Wiedemann <bmwiedem...@opensuse.org> Date: 2018-03-02 _build_docs is called 6 times - once for each file in bin because of that, the old code was racy when using make -j which is the default in openSUSE https://bugzilla.opensuse.org/show_bug.cgi?id=1083835 Index: App-ClusterSSH-4.07/bin_PL/_build_docs =================================================================== --- App-ClusterSSH-4.07.orig/bin_PL/_build_docs +++ App-ClusterSSH-4.07/bin_PL/_build_docs @@ -16,16 +16,15 @@ if(! -d $bindir) { print "Using perl binary: $^X",$/; print "Using perl version $^V",$/; -for my $source (glob("*")) { - my $dest="$bindir/$source"; +my $dest = shift; +my $source = $dest; +$source =~ s{bin/}{}; +$dest = "../$dest"; - next if($source =~ m/$Script/); - next if($source =~ m/\.x$/); - - print "Generating: $source",$/; +print "Generating: $dest from $source",$/; if(-f $dest) { - chmod(0777, $dest) || die "Could not chmod $dest for removing: $!"; + chmod(0755, $dest) || die "Could not chmod $dest for removing: $!"; } open(my $sfh, '<', $source) || die "Could not open $source for reading: $!"; @@ -44,4 +43,3 @@ for my $source (glob("*")) { close($dfh); chmod(0555, $dest) || die "Could not chmod $dest: $!"; -}
