dist-git conversion

- Resolves: #600004

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: make
-# $Id: Makefile,v 1.2 2007/10/15 19:07:36 notting Exp $
-NAME := make
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

make-3.81-recursion-test.patch

@@ -0,0 +1,13 @@
+--- make-3.81/tests/scripts/features/recursion~	2005-02-10 01:10:58.000000000 +0100
++++ make-3.81/tests/scripts/features/recursion	2010-05-26 15:30:30.000000000 +0200
+@@ -16,7 +16,7 @@ last:
+ 	@echo MAKELEVEL = $(MAKELEVEL)
+ 	@echo THE END
+ ',
+-              ('CFLAGS=-O -w' . ($parallel_jobs ? '-j 2' : '')),
++              ('CFLAGS=-O -w' . ($parallel_jobs ? ' -j 2' : '')),
+               ($vos
+                ? "#MAKE#: Entering directory `#PWD#'
+ make 'CFLAGS=-O' -f #MAKEFILE# foo
+
+Diff finished.  Wed May 26 15:30:43 2010

make.spec

@@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 18%{?dist}
+Release: 19%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -18,6 +18,7 @@ Patch9: make-3.81-newlines.patch
 Patch10: make-3.81-jobserver.patch
 Patch11: make-3.81-fdleak.patch
 Patch12: make-3.81-strcpy-overlap.patch
+Patch13: make-3.81-recursion-test.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -42,6 +43,7 @@ makefile.
 %patch10 -p1
 %patch11 -p1
 %patch12 -p0
+%patch13 -p1
 
 %build
 %configure
@@ -84,6 +86,10 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Fri Jun  4 2010 Petr Machata <pmachata@redhat.com> - 1:3.81-19
+- Fix testsuite on F13
+- Resolves: #600004
+
 * Tue Aug 11 2009 Petr Machata <pmachata@redhat.com> - 1:3.81-18
 - Fix installation with --excludedocs
 - Resolves: #515917