From 0a63e7802ef15085ba039560d8b4bd590ca6b9c9 Mon Sep 17 00:00:00 2001
From: "Ankur Sinha (Ankur Sinha Gmail)" <sanjay.ankur@gmail.com>
Date: Sun, 4 Jul 2021 11:23:04 +0100
Subject: [PATCH] feat: update to latests upstream release

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1925991
---
 .gitignore                   |  1 +
 Random123-1.13.2-s390x.patch | 33 ---------------------------------
 Random123.spec               | 19 +++++++++++--------
 sources                      |  2 +-
 4 files changed, 13 insertions(+), 42 deletions(-)
 delete mode 100644 Random123-1.13.2-s390x.patch

diff --git a/.gitignore b/.gitignore
index 45b435b..e395e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /Random123-1.08.tar.gz
 /Random123-1.09.tar.gz
 /Random123-1.13.2.tar.gz
+/Random123-1.14.0.tar.gz
diff --git a/Random123-1.13.2-s390x.patch b/Random123-1.13.2-s390x.patch
deleted file mode 100644
index e70250c..0000000
--- a/Random123-1.13.2-s390x.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up Random123-1.13.2/include/Random123/features/gccfeatures.h.orig Random123-1.13.2/include/Random123/features/gccfeatures.h
---- Random123-1.13.2/include/Random123/features/gccfeatures.h.orig	2020-02-24 06:09:37.192339552 -0500
-+++ Random123-1.13.2/include/Random123/features/gccfeatures.h	2020-02-24 06:09:56.902339552 -0500
-@@ -34,7 +34,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- 
- #define R123_GNUC_VERSION (__GNUC__*10000 + __GNUC_MINOR__*100 + __GNUC_PATCHLEVEL__)
- 
--#if !defined(__x86_64__) && !defined(__i386__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__)
-+#if !defined(__x86_64__) && !defined(__i386__) && !defined(__powerpc__) && !defined(__arm__) && !defined(__aarch64__) && !defined(__s390x__)
- #  error "This code has only been tested on x86, powerpc and a few arm platforms."
- #include <including_a_nonexistent_file_will_stop_some_compilers_from_continuing_with_a_hopeless_task>
- { /* maybe an unbalanced brace will terminate the compilation */
-diff -up Random123-1.13.2/tests/util_cpu.h.orig Random123-1.13.2/tests/util_cpu.h
---- Random123-1.13.2/tests/util_cpu.h.orig	2020-02-24 06:45:47.762339552 -0500
-+++ Random123-1.13.2/tests/util_cpu.h	2020-02-24 07:00:13.302339552 -0500
-@@ -128,9 +128,14 @@ static double clockspeedHz(int *ncores,
- 	    dprintf(("cleaned modelname is %s\n", *modelnamep));
- 	}
- 	if ((s = strstr(buf, "cpu MHz")) || (s = strstr(buf, "clock"))) {
--	    if (s[1] == 'p') // cpu MHz
--		CHECKNOTZERO(sscanf(s, "cpu MHz : %lf %n", &xMhz, &i));
--	    else // clock
-+	    if (s[1] == 'p') { // cpu MHz
-+		if (s[8] == ':')
-+		    CHECKNOTZERO(sscanf(s, "cpu MHz : %lf %n", &xMhz, &i));
-+		else if (s[8] == 's')
-+		    CHECKNOTZERO(sscanf(s, "cpu MHz static  : %lf %n", &xMhz, &i));
-+		else if (s[8] == 'd')
-+		    continue; // cpu MHz dynamic
-+	    } else // clock
- 		CHECKNOTZERO(sscanf(s, "clock : %lfMHz %n", &xMhz, &i));
- 	    dprintf(("parsed %f %d\n", xMhz, i));
- 	    if (xMhz > Mhz) Mhz = xMhz;
diff --git a/Random123.spec b/Random123.spec
index cb58557..070558e 100644
--- a/Random123.spec
+++ b/Random123.spec
@@ -1,21 +1,20 @@
 %global debug_package %{nil}
 
 Name:       Random123
-Version:    1.13.2
-Release:    5%{?dist}
+Version:    1.14.0
+Release:    1%{?dist}
 Summary:    Library of random number generators
 
 License:    BSD
-URL:        http://www.deshawresearch.com/resources_random123.html
-Source0:    http://www.deshawresearch.com/downloads/download_random123.cgi/%{name}-%{version}.tar.gz
+URL:        https://github.com/DEShawResearch/random123/
+Source0:    %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch0:     0001-add-missing-headers.patch
-Patch1:     Random123-1.13.2-s390x.patch
 
 # gccfeatures.h mentions what arches are supported
 # these aren't on the list
 ExcludeArch:    mips64r2 mips32r2 s390
 
-BuildRequires: make
+BuildRequires:  make
 BuildRequires:  doxygen
 # For tests
 BuildRequires:  gcc gcc-c++
@@ -47,13 +46,13 @@ Provides:  %{name} = %{version}-%{release}
 Development files for %{name}.
 
 %package doc
-Summary:    Documentation for %{name}.
+Summary:    Documentation for %{name}
 
 %description doc
 Documentation for %{name}.
 
 %prep
-%autosetup -S patch -p1
+%autosetup -n random123-%{version} -S patch -p1
 
 
 %build
@@ -81,6 +80,10 @@ popd
 %doc examples
 
 %changelog
+* Sun Jul 04 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.14.0-1
+- Update to latest release
+- Drop no longer needed s390x patch (merged upstream)
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index e8970c1..a226247 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Random123-1.13.2.tar.gz) = 543ed679911177c2da00b920c376abc8c5f4496c9a6a4ed823c295f5222e370bc2b8c9c5b63e93ae507252999eecfc112ae3203a2a82f9deb8747a9f9d387b18
+SHA512 (Random123-1.14.0.tar.gz) = 1c7d139193f5404e5d14d229f55e0a14b11de596a4cfbf0a39c1419f5ae146055dccc61e9430f724a2d7c1efb8bd01edb72866d4f4705508fcc6ebda6e90e91e