Accepting request 256806 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/256806
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/make?expand=0&rev=33

make-4.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb
-size 1341927

make-4.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5
+size 1327342

make-library-search-path.diff

@@ -3,10 +3,16 @@ them with .LIBPATTERNS into libmoo.so
 
 This patch extends to teh search path to /lib64/ and /usr/lib64
 
---- remake.c	2001/12/11 15:59:03	1.1
+---
-+++ remake.c	2001/12/11 16:01:01
+ remake.c |    2 ++
-@@ -1252,6 +1252,8 @@
+ 1 file changed, 2 insertions(+)
-   static char *dirs[] =
+
+Index: make-4.1/remake.c
+===================================================================
+--- make-4.1.orig/remake.c	2014-10-05 17:24:51.000000000 +0100
++++ make-4.1/remake.c	2014-10-15 23:20:42.000000000 +0100
+@@ -1549,6 +1549,8 @@ library_search (const char *lib, FILE_TI
+   static const char *dirs[] =
      {
  #ifndef _AMIGA
 +      "/lib64",

make-testcases_timeout.diff

@@ -1,46 +1,17 @@
-diff -rNU 20 ../make-4.0-o/tests/test_driver.pl ./tests/test_driver.pl
+---
---- ../make-4.0-o/tests/test_driver.pl	2013-10-09 08:05:39.000000000 +0200
+ tests/test_driver.pl |    2 +-
-+++ ./tests/test_driver.pl	2014-03-11 14:08:15.000000000 +0100
+ 1 file changed, 1 insertion(+), 1 deletion(-)
-@@ -33,41 +33,41 @@
+
- 
+Index: make-4.1/tests/test_driver.pl
- # The number of test categories we've run
+===================================================================
- $categories_run = 0;
+--- make-4.1.orig/tests/test_driver.pl	2014-10-15 23:16:56.000000000 +0100
- # The number of test categroies that have passed
++++ make-4.1/tests/test_driver.pl	2014-10-15 23:17:23.000000000 +0100
- $categories_passed = 0;
+@@ -49,7 +49,7 @@ $tests_passed = 0;
- # The total number of individual tests that have been run
- $total_tests_run = 0;
- # The total number of individual tests that have passed
- $total_tests_passed = 0;
- # The number of tests in this category that have been run
- $tests_run = 0;
- # The number of tests in this category that have passed
- $tests_passed = 0;
- 
- 
- # Yeesh.  This whole test environment is such a hack!
  $test_passed = 1;
  
- 
  # Timeout in seconds.  If the test takes longer than this we'll fail it.
 -$test_timeout = 5;
 +$test_timeout = 8;
+ $test_timeout = 10 if $^O eq 'VMS';
  
  # Path to Perl
- $perl_name = $^X;
- 
- # %makeENV is the cleaned-out environment.
- %makeENV = ();
- 
- # %extraENV are any extra environment variables the tests might want to set.
- # These are RESET AFTER EVERY TEST!
- %extraENV = ();
- 
- # %origENV is the caller's original environment
- %origENV = %ENV;
- 
- sub resetENV
- {
-   # We used to say "%ENV = ();" but this doesn't work in Perl 5.000
-   # through Perl 5.004.  It was fixed in Perl 5.004_01, but we don't
-   # want to require that here, so just delete each one individually.
-   foreach $v (keys %ENV) {

make.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Oct 15 22:21:06 UTC 2014 - andreas.stieger@gmx.de
+
+- make 4.1:
+  * New variables: $(MAKE_TERMOUT) and $(MAKE_TERMERR) are set to
+    non-empty values if stdout or stderr, respectively, are
+    believed to be writing to a terminal.  These variables are
+    exported by default.
+  * Allow a no-text-argument form of the $(file ...) function.
+  * Change the fatal error for mixed explicit and implicit rules
+- refresh for contect changes:
+  * make-library-search-path.diff
+  * make-testcases_timeout.diff
+
 -------------------------------------------------------------------
 Tue Mar 11 14:10:15 CET 2014 - draht@suse.de
 

make.spec

@@ -20,7 +20,7 @@ Name:           make
 Url:            http://www.gnu.org/software/make/make.html
 Provides:       gmake
 PreReq:         %install_info_prereq
-Version:        4.0
+Version:        4.1
 Release:        0
 Summary:        GNU make
 License:        GPL-2.0+
@@ -39,9 +39,9 @@ The GNU make command with extensive documentation.
 
 %prep
 %setup -q
-%patch1 -p0
+%patch1 -p1
 if [ %_lib == lib64 ]; then
-%patch64
+%patch64 -p1
 fi
 
 %build