diff --git a/make-4.0-noclock_gettime.patch b/make-4.0-noclock_gettime.patch index f63e1fc..65033e8 100644 --- a/make-4.0-noclock_gettime.patch +++ b/make-4.0-noclock_gettime.patch @@ -1,14 +1,12 @@ -diff -up make-3.82/configure\~ make-3.82/configure ---- make-3.82/configure~ 2010-07-28 07:41:51.000000000 +0200 -+++ make-3.82/configure 2010-08-11 15:07:50.000000000 +0200 -@@ -7215,7 +7215,7 @@ return clock_gettime (); +diff -rup a/configure b/configure +--- a/configure 2022-10-31 02:23:40.000000000 -0400 ++++ b/configure 2022-11-01 17:25:35.970942563 -0400 +@@ -12467,7 +12467,7 @@ return clock_gettime (); return 0; } _ACEOF --for ac_lib in '' rt posix4; do -+for ac_lib in '' posix4; do +-for ac_lib in '' rt posix4 ++for ac_lib in '' posix4 + do if test -z "$ac_lib"; then ac_res="none required" - else - -Diff finished. Wed Aug 11 15:07:59 2010 diff --git a/make-4.3-getcwd.patch b/make-4.3-getcwd.patch index 7f6f18f..8825008 100644 --- a/make-4.3-getcwd.patch +++ b/make-4.3-getcwd.patch @@ -1,12 +1,12 @@ -diff -Nrup a/src/makeint.h b/src/makeint.h ---- a/src/makeint.h 2016-05-21 16:22:32.000000000 -0400 -+++ b/src/makeint.h 2016-09-22 16:12:38.606702160 -0400 -@@ -596,7 +596,7 @@ long int lseek (); +diff -rup a/src/makeint.h b/src/makeint.h +--- a/src/makeint.h 2022-10-24 02:22:00.000000000 -0400 ++++ b/src/makeint.h 2022-11-01 17:20:24.764001510 -0400 +@@ -678,7 +678,7 @@ long int lseek (); # endif # ifdef HAVE_GETCWD -# if !defined(VMS) && !defined(__DECC) +# if !defined(VMS) && !defined(__DECC) && !defined(getcwd) - char *getcwd (); + char *getcwd (void); # endif # else diff --git a/make-4.3-j8k.patch b/make-4.3-j8k.patch index 60a0c7f..c965379 100644 --- a/make-4.3-j8k.patch +++ b/make-4.3-j8k.patch @@ -1,7 +1,7 @@ -diff -Nrup a/src/main.c b/src/main.c ---- a/src/main.c 2016-05-31 03:17:26.000000000 -0400 -+++ b/src/main.c 2016-09-22 16:18:52.283889265 -0400 -@@ -2051,6 +2051,21 @@ main (int argc, char **argv, char **envp +diff -rup a/src/main.c b/src/main.c +--- a/src/main.c 2022-10-24 02:22:00.000000000 -0400 ++++ b/src/main.c 2022-11-01 17:31:41.072952404 -0400 +@@ -2195,6 +2195,21 @@ main (int argc, char **argv, char **envp } #endif diff --git a/make.spec b/make.spec index 765627f..f525e2b 100644 --- a/make.spec +++ b/make.spec @@ -4,15 +4,15 @@ # optional versioned updates. Name: make Epoch: 1 -Version: 4.3 -Release: 11%{?dist} +Version: 4.4 +Release: 1%{?dist} License: GPLv3+ URL: http://www.gnu.org/software/make/ Source: ftp://ftp.gnu.org/gnu/make/make-%{version}.tar.gz %if "%{name}" != "make" # Set this to the sub-package base name, for "make-latest" -%global make make43 +%global make make44 %if 0%{?rhel} > 0 %global _prefix /opt/rh/%{make} %else @@ -44,16 +44,6 @@ Patch1: make-4.0-noclock_gettime.patch # BZs #142691, #17374 Patch2: make-4.3-j8k.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1827850 -# https://savannah.gnu.org/bugs/?58232 -# Remove on next make rebase -Patch3: make-4.3-cloexec.patch - -# https://bugzilla.redhat.com/show_bug.cgi?id=2010506 -# https://savannah.gnu.org/bugs/?59093 -# Remove on next make rebase -Patch4: make-4.3-filter-out.patch - # autoreconf BuildRequires: make BuildRequires: autoconf, automake, gettext-devel @@ -144,6 +134,9 @@ echo ============END TESTING=========== %{_includedir}/gnumake.h %changelog +* Tue Nov 1 2022 DJ Delorie - 1:4.4-1 +- Rebase to make 4.4 + * Thu Jul 21 2022 Fedora Release Engineering - 1:4.3-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 207f696..578eea4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (make-4.3.tar.gz) = 9a1185cc468368f4ec06478b1cfa343bf90b5cd7c92c0536567db0315b0ee909af53ecce3d44cfd93dd137dbca1ed13af5713e8663590c4fdd21ea635d78496b +SHA512 (make-4.4.tar.gz) = 4be73f494295dcfa10034531b0d920cfdb5438bc20625f863f5c878549c140e1e67195162580c53060c3c11c67a2c739c09051f02cdd283e5aa9ebcd68975a1f