Switch to "proper" 1.2.1 tarball.

Rediff openucx-s390x-support.patch as p1 to be in line with potential git-generated patches.

OBS-URL: https://build.opensuse.org/package/show/science:HPC/openucx?expand=0&rev=9

_service

@@ -1,14 +0,0 @@
-<services>
-	<service name="tar_scm" mode="disabled">
- 		<param name="scm">git</param>
-		<param name="url">git://github.com/openucx/ucx</param>
-		<param name="revision">756c745a34035d1946f96e7e868a30781d908302</param>
-		<param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param>
-		<param name="versionrewrite-pattern">v(.*)</param>
-		<param name="versionrewrite-replacement">\1</param>
-	</service>
-	<service name="recompress" mode="disabled">
-		<param name="file">*.tar</param>
-		<param name="compression">xz</param>
-	</service>
-</services>

openucx-s390x-support.patch

@@ -1,8 +1,20 @@
-diff --git src/ucs/Makefile.am src/ucs/Makefile.am
+From: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
-index ba869dbf..c588cd9d 100644
+Date: 2017-06-29 08:09:49 +0000
---- src/ucs/Makefile.am
+
-+++ src/ucs/Makefile.am
+---
-@@ -25,6 +25,8 @@ nobase_dist_libucs_la_HEADERS = \
+ src/ucs/Makefile.am         |    2 +
+ src/ucs/arch/atomic.h       |    2 +
+ src/ucs/arch/bitops.h       |    2 +
+ src/ucs/arch/cpu.h          |    2 +
+ src/ucs/arch/s390x/bitops.h |   32 +++++++++++++++++++++++++++
+ src/ucs/arch/s390x/cpu.h    |   51 ++++++++++++++++++++++++++++++++++++++++++++
+ 6 files changed, 91 insertions(+)
+
+Index: ucx-1.2.1/src/ucs/Makefile.am
+===================================================================
+--- ucx-1.2.1.orig/src/ucs/Makefile.am
++++ ucx-1.2.1/src/ucs/Makefile.am
+@@ -26,6 +26,8 @@ nobase_dist_libucs_la_HEADERS = \
  	arch/generic/cpu.h \
  	arch/ppc64/bitops.h \
  	arch/ppc64/cpu.h \
@@ -11,10 +23,10 @@ index ba869dbf..c588cd9d 100644
  	arch/x86_64/atomic.h \
  	arch/x86_64/bitops.h \
  	arch/x86_64/cpu.h \
-diff --git src/ucs/arch/atomic.h src/ucs/arch/atomic.h
+Index: ucx-1.2.1/src/ucs/arch/atomic.h
-index 7649971b..7bb2bc36 100644
+===================================================================
---- src/ucs/arch/atomic.h
+--- ucx-1.2.1.orig/src/ucs/arch/atomic.h
-+++ src/ucs/arch/atomic.h
++++ ucx-1.2.1/src/ucs/arch/atomic.h
 @@ -15,6 +15,8 @@
  #  include "generic/atomic.h"
  #elif defined(__aarch64__)
@@ -24,10 +36,10 @@ index 7649971b..7bb2bc36 100644
  #else
  #  error "Unsupported architecture"
  #endif
-diff --git src/ucs/arch/bitops.h src/ucs/arch/bitops.h
+Index: ucx-1.2.1/src/ucs/arch/bitops.h
-index f4dd3ab4..de53bde0 100644
+===================================================================
---- src/ucs/arch/bitops.h
+--- ucx-1.2.1.orig/src/ucs/arch/bitops.h
-+++ src/ucs/arch/bitops.h
++++ ucx-1.2.1/src/ucs/arch/bitops.h
 @@ -14,6 +14,8 @@
  #  include "ppc64/bitops.h"
  #elif defined(__aarch64__)
@@ -37,10 +49,10 @@ index f4dd3ab4..de53bde0 100644
  #else
  #  error "Unsupported architecture"
  #endif
-diff --git src/ucs/arch/cpu.h src/ucs/arch/cpu.h
+Index: ucx-1.2.1/src/ucs/arch/cpu.h
-index d5127b3d..817ac0d2 100644
+===================================================================
---- src/ucs/arch/cpu.h
+--- ucx-1.2.1.orig/src/ucs/arch/cpu.h
-+++ src/ucs/arch/cpu.h
++++ ucx-1.2.1/src/ucs/arch/cpu.h
 @@ -52,6 +52,8 @@ typedef enum ucs_cpu_flag {
  #  include "ppc64/cpu.h"
  #elif defined(__aarch64__)
@@ -50,11 +62,10 @@ index d5127b3d..817ac0d2 100644
  #else
  #  error "Unsupported architecture"
  #endif
-diff --git src/ucs/arch/s390x/bitops.h src/ucs/arch/s390x/bitops.h
+Index: ucx-1.2.1/src/ucs/arch/s390x/bitops.h
-new file mode 100644
+===================================================================
-index 00000000..39ad1251
 --- /dev/null
-+++ src/ucs/arch/s390x/bitops.h
++++ ucx-1.2.1/src/ucs/arch/s390x/bitops.h
 @@ -0,0 +1,32 @@
 +/**
 +* Copyright (C) Mellanox Technologies Ltd. 2001-2015.  ALL RIGHTS RESERVED.
@@ -88,11 +99,10 @@ index 00000000..39ad1251
 +}
 +
 +#endif
-diff --git src/ucs/arch/s390x/cpu.h src/ucs/arch/s390x/cpu.h
+Index: ucx-1.2.1/src/ucs/arch/s390x/cpu.h
-new file mode 100644
+===================================================================
-index 00000000..f5131ea3
 --- /dev/null
-+++ src/ucs/arch/s390x/cpu.h
++++ ucx-1.2.1/src/ucs/arch/s390x/cpu.h
 @@ -0,0 +1,51 @@
 +/**
 +* Copyright (C) Mellanox Technologies Ltd. 2001-2013.  ALL RIGHTS RESERVED.

openucx.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 19 13:52:13 UTC 2017 - jengelh@inai.de
+
+- Rediff openucx-s390x-support.patch as p1 to be in line with
+  potential git-generated patches.
+
 -------------------------------------------------------------------
 Tue Sep 19 09:26:07 UTC 2017 - nmoreychaisemartin@suse.com
 

openucx.spec

@@ -16,8 +16,6 @@
 #
 
 
-%define git_ver .0.756c745a
-
 Name:           openucx
 Summary:        Unifieid Communication X
 License:        BSD-3-Clause
@@ -28,8 +26,8 @@ Url:            http://openucx.org/
 
 #Git-Clone:	git://github.com/openucx/ucx
 #Git-Web:	https://github.com/openucx/ucx
-Source:         ucx-%{version}%{git_ver}.tar.xz
+Source:         https://github.com/openucx/ucx/releases/download/v%version/ucx-%version.tar.gz
-Patch0:         openucx-s390x-support.patch
+Patch1:         openucx-s390x-support.patch
 BuildRequires:  autoconf >= 2.63
 BuildRequires:  automake >= 1.10
 BuildRequires:  binutils-devel
@@ -128,8 +126,8 @@ Low-level API that expose basic network operations supported by
 underlying hardware.
 
 %prep
-%setup -qn  ucx-%{version}%{git_ver}
+%setup -qn ucx-%version
-%patch0
+%patch -P 1 -p1
 
 %build
 autoreconf -fi

ucx-1.2.1.0.756c745a.tar.xz

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

ucx-1.2.1.tar.gz

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