Accepting request 874730 from devel:tools:building

- make generated autoconf makefiles reproducible (bsc#1182604):
  add automake-reproducible.patch

OBS-URL: https://build.opensuse.org/request/show/874730
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/automake?expand=0&rev=55

automake-reproducible.patch

@@ -0,0 +1,56 @@
+--- automake-1.16.3/bin/automake.in
++++ automake-1.16.3/bin/automake.in
+@@ -2388,7 +2388,7 @@
+   $var->requires_variables ("\@${lt}LIBOBJS\@ used", $lt . 'LIBOBJS')
+     if ! keys %libsources;
+ 
+-  foreach my $iter (keys %libsources)
++  foreach my $iter (sort keys %libsources)
+     {
+       my $dir = '';
+       if ($iter =~ /^(.*)(\.[cly])$/)
+@@ -4692,7 +4692,7 @@
+ 	     DIST_CLEAN, [],
+ 	     MAINTAINER_CLEAN, []);
+ 
+-  foreach my $file (keys %clean_files)
++  foreach my $file (sort keys %clean_files)
+     {
+       my $when = $clean_files{$file};
+       prog_error 'invalid entry in %clean_files'
+@@ -4762,7 +4762,7 @@
+ 	       . "not 'install-hook'");
+ 
+   # Install the -local hooks.
+-  foreach (keys %dependencies)
++  foreach (sort keys %dependencies)
+     {
+       # Hooks are installed on the -am targets.
+       s/-am$// or next;
+@@ -4784,7 +4784,7 @@
+     }
+ 
+   # All the required targets are phony.
+-  depend ('.PHONY', keys %required_targets);
++  depend ('.PHONY', sort keys %required_targets);
+ 
+   # Actually output gathered targets.
+   foreach (sort target_cmp keys %dependencies)
+@@ -5260,7 +5260,7 @@
+   # has a precise meaning for AC_CONFIG_FILES and so on.
+   $traces .= join (' ',
+ 		   map { "--trace=$_" . ':\$f:\$l::\$d::\$n::\${::}%' }
+-		   (keys %traced));
++		   (sort keys %traced));
+ 
+   verb "running WARNINGS=$ENV{WARNINGS} $traces";
+   my $tracefh = new Automake::XFile ("$traces $filename |");
+@@ -5831,7 +5831,7 @@
+ {
+   my ($self) = @_;
+ 
+-  foreach my $prog (keys %known_programs)
++  foreach my $prog (sort keys %known_programs)
+     {
+       lang_vala_finish_target ($self, $prog);
+     }

automake.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb 23 20:56:39 UTC 2021 - Dirk Müller <dmueller@suse.com>
+
+- make generated autoconf makefiles reproducible (bsc#1182604):
+  add automake-reproducible.patch 
+
 -------------------------------------------------------------------
 Sun Jan 17 18:42:38 UTC 2021 - Dirk Müller <dmueller@suse.com>
 

automake.spec

@@ -42,8 +42,8 @@ Source3:        automake-rpmlintrc
 Patch1:         https://git.savannah.gnu.org/cgit/automake.git/patch/?id=ccb57553e3433df3e52e534e6f87915db23ff9a5#/fix-testsuite-failures-with-autoconf270.patch
 Patch2:         automake-require_file.patch
 Patch3:         automake-1.13.4-fix-primary-prefix-invalid-couples-test.patch
+Patch4:         automake-reproducible.patch
 Patch5:         0001-correct-parameter-parsing-in-test-driver-script.patch
-
 Patch100:       automake-suse-vendor.patch
 BuildRequires:  autoconf >= 2.69
 BuildRequires:  bison
@@ -88,11 +88,7 @@ definitions (with rules occasionally thrown in).  The generated
 
 %prep
 %setup -q -n automake-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch5 -p1
-%patch100 -p1
+%autopatch -p1
 
 %build
 sh bootstrap