From e4fd09daccd0f7268461ff3a5b3029dc9c64fc8c2bc4a0a6979a259dc8a9605e Mon Sep 17 00:00:00 2001
From: Raymund Will <rw@suse.com>
Date: Tue, 29 Jan 2019 14:42:08 +0000
Subject: [PATCH] Accepting request 669871 from
 home:rwill:branches:hardware:nvdimm

Update to v01.00.00.3402, getting rid of "random" git-snapshot for this time.

OBS-URL: https://build.opensuse.org/request/show/669871
OBS-URL: https://build.opensuse.org/package/show/hardware:nvdimm/ipmctl?expand=0&rev=19
---
 ...tl-01.00.00.3394.1547861714.b7a59da.tar.gz |  3 ---
 ipmctl-01.00.00.3402.tar.gz                   |  3 +++
 ipmctl.changes                                |  7 ++++++
 ipmctl.spec                                   | 25 +++++++++++++------
 4 files changed, 27 insertions(+), 11 deletions(-)
 delete mode 100644 ipmctl-01.00.00.3394.1547861714.b7a59da.tar.gz
 create mode 100644 ipmctl-01.00.00.3402.tar.gz

diff --git a/ipmctl-01.00.00.3394.1547861714.b7a59da.tar.gz b/ipmctl-01.00.00.3394.1547861714.b7a59da.tar.gz
deleted file mode 100644
index da2afc2..0000000
--- a/ipmctl-01.00.00.3394.1547861714.b7a59da.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4857fd0cadbc8d27049aeb08fc03c3a7e74d11863420b1a151b22569a3b55383
-size 10836351
diff --git a/ipmctl-01.00.00.3402.tar.gz b/ipmctl-01.00.00.3402.tar.gz
new file mode 100644
index 0000000..b313761
--- /dev/null
+++ b/ipmctl-01.00.00.3402.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c076446c1414d2f2bc80d3ff16abfaed1cd231415408a7af2be5355af1065e0
+size 10456674
diff --git a/ipmctl.changes b/ipmctl.changes
index f3ec60b..79dd6d4 100644
--- a/ipmctl.changes
+++ b/ipmctl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 29 14:03:31 UTC 2019 - rw@suse.com
+
+- Update to v01.00.00.3402.
+  Sync with upstream release, no content changes.
+- Improve spec-file.
+
 -------------------------------------------------------------------
 Fri Jan 21 10:42:00 UTC 2019 - rw@suse.com
 
diff --git a/ipmctl.spec b/ipmctl.spec
index 0572a63..8c9461f 100644
--- a/ipmctl.spec
+++ b/ipmctl.spec
@@ -17,23 +17,31 @@
 
 
 %define abi     3
-%define vgit    .1547861714.b7a59da
+#define vgit    .1547861714.b7a59da
+%define vgit    ""
 %define vSafeC  03032018
 %define pSafeC  rurban/safeclib/releases/download/v%{vSafeC}
+%bcond_with     precompiledSafeC
 
 Name:           ipmctl
-Version:        01.00.00.3394
+Version:        01.00.00.3402
 Release:        0
 Summary:        Utility for managing Intel Optane DC persistent memory modules
 License:        BSD-3-Clause
 Group:          System/Management
 Url:            https://github.com/intel/ipmctl
-#SIC!e:         https://github.com/intel/ipmctl/archive/v%%{version}.tar.gz#/%%{name}-%%{version}.tar.gz
+%if %{vgit} == ""
+Source:         https://github.com/intel/ipmctl/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
+%else
 Source:         %{name}-%{version}%{vgit}.tar.gz
+%endif
 Source1:        ChangeLog.xz
 Source2:        %{name}-rpmlintrc
+%if %{without precompiledSafeC}
 Source10:       https://github.com/%{pSafeC}/libsafec-%{vSafeC}.0-g570fa5.tar.gz
-#SIC!e10:       libsafec-prebuild.tar.xz
+%else
+Source10:       libsafec-prebuild.tar.xz
+%endif
 Source11:       mkSafeC
 Source12:       libsafec-patches.tar
 Patch1:         ipmctl-python3.patch
@@ -56,10 +64,13 @@ BuildRequires:  automake
 BuildRequires:  gcc
 BuildRequires:  libtool
 
+# no 'Conflicts' for 'zypper patch'
+Obsoletes:      lib%{name}2
+# for impctl
 Obsoletes:      ixpdimm-cli < 01.00.00.3000
+# for (obsoleted) libipmctl2 et.al.
 Obsoletes:      ixpdimm-data < 01.00.00.3000
 Obsoletes:      ixpdimm_sw < 01.00.00.3000
-Obsoletes:      lib%{name}2
 Obsoletes:      libixpdimm < 01.00.00.3000
 Obsoletes:      libixpdimm-cim < 01.00.00.3000
 Obsoletes:      libixpdimm-cli < 01.00.00.3000
@@ -102,9 +113,7 @@ API for development of Intel Optane DC persistent memory management utilities.
 %setup -q -n %{name}-%{version}%{vgit} -a 10
 %patch1 -p1
 
-LICENSE_VIOLATIONS_IN=$(find . -type f -print0 | sort -z |
-  xargs -0r grep -li 'INTEL CONFIDENTIAL' || true)
-[ -z "$LICENSE_VIOLATIONS_IN" ]
+! grep -lri 'INTEL CONFIDENTIAL' || exit 1
 
 %build
 /bin/bash -ex "%{SOURCE11}" "%{SOURCE12}" "%{?_smp_mflags}"