From 2eebd2b6806e8fe9c05bf51f9b8f98e4a26cd2d268a4afe85a7ffef0c6495aec Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Fri, 9 Jul 2021 11:11:06 +0000
Subject: [PATCH] Accepting request 905241 from
 home:trenn:branches:systemsmanagement

- Enhance _service file to always get latest sources and get the
  version correctly parsed

OBS-URL: https://build.opensuse.org/request/show/905241
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=60
---
 _service                                   | 17 +++++++------
 enterprise-numbers                         | 28 ++++++++++++++++++++--
 ipmitool-1.8.18+git20210622.11c7605.tar.xz |  3 ---
 ipmitool-1.8.18.237.g11c7605.obscpio       |  3 +++
 ipmitool.changes                           |  3 +++
 ipmitool.obsinfo                           |  5 ++++
 ipmitool.spec                              |  2 +-
 7 files changed, 46 insertions(+), 15 deletions(-)
 delete mode 100644 ipmitool-1.8.18+git20210622.11c7605.tar.xz
 create mode 100644 ipmitool-1.8.18.237.g11c7605.obscpio
 create mode 100644 ipmitool.obsinfo

diff --git a/_service b/_service
index bbf8378..6cb47fd 100644
--- a/_service
+++ b/_service
@@ -1,21 +1,20 @@
 <services>
-  <service mode="disabled" name="tar_scm">
+  <service name="obs_scm" mode="localonly">
     <param name="url">https://github.com/ipmitool/ipmitool.git</param>
     <param name="scm">git</param>
     <param name="version">HEAD</param>
+    <param name="versionrewrite-pattern">IPMITOOL_([0-9]*)_([0-9]*)_([0-9]*)</param>
+    <param name="versionrewrite-replacement">\1.\2.\3</param>
+    <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.g%h</param>
     <param name="changesgenerate">enable</param>
-    <param name="filename">ipmitool</param>
-<!--
-    <param name="versionformat">1.8.18</param>
--->
-    <param name="versionformat">1.8.18+git%cd.%h</param>    
   </service>
-  <service mode="disabled" name="recompress">
+  <service name="set_version" mode="localonly"/>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
     <param name="file">*.tar</param>
     <param name="compression">xz</param>
   </service>
-  <service mode="disabled" name="set_version"/>
-  <service mode="disabled" name="download_url">
+  <service name="download_url" mode="localonly">
    <param name="protocol">http</param>
    <param name="host">www.iana.org</param>
    <param name="path">assignments/enterprise-numbers/enterprise-numbers</param>
diff --git a/enterprise-numbers b/enterprise-numbers
index bdfdaf8..d8d9726 100644
--- a/enterprise-numbers
+++ b/enterprise-numbers
@@ -1,6 +1,6 @@
 PRIVATE ENTERPRISE NUMBERS
 
-(last updated 2021-07-07)
+(last updated 2021-07-08)
 
 SMI Network Management Private Enterprise Codes:
 
@@ -209920,7 +209920,7 @@ Decimal
 52592
   JOVYATLAS
     Andreas Doyen
-      andreas.doyen&wartsila.com
+      andreas.doyen&jovyatlas.de
 52593
   Urzad Marszalkowski Wojewodztwa Podlaskiego
     Lukasz Wejda
@@ -230233,6 +230233,30 @@ Decimal
   Cleveron AS
     Raul Tambre
       raul.tambre&cleveron.com
+57671
+  Silvaris Corporation
+    Dave Sheffels
+      it&silvaris.com
+57672
+  CerSign Technology Limited
+    Richard Wang
+      wang&cersign.com
+57673
+  X.O Concepts
+    Dilan Walgampaya
+      dilan&xdoto.io
+57674
+  JUSTFLY NETWORKS
+    Joseph Flynn
+      justfly1111&icloud.com
+57675
+  Dr. Markus Regensburger
+    Dr. Markus Regensburger
+      edv&dr-regensburger.de
+57676
+  La marm'hotte
+    Commission GSI
+      contact&la-marmhotte.org
 
 
 End of Document
\ No newline at end of file
diff --git a/ipmitool-1.8.18+git20210622.11c7605.tar.xz b/ipmitool-1.8.18+git20210622.11c7605.tar.xz
deleted file mode 100644
index 7e46b16..0000000
--- a/ipmitool-1.8.18+git20210622.11c7605.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f729abdf8046fa024d40086b87b9bac63fe333e3234cf480c1856d39bb099c0
-size 458740
diff --git a/ipmitool-1.8.18.237.g11c7605.obscpio b/ipmitool-1.8.18.237.g11c7605.obscpio
new file mode 100644
index 0000000..ea44480
--- /dev/null
+++ b/ipmitool-1.8.18.237.g11c7605.obscpio
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:826d825fa29cdc17cf84802c3f9d0ea0e5e6828c3cbaf26c80258af91fde22c2
+size 3027468
diff --git a/ipmitool.changes b/ipmitool.changes
index 5c8b8b2..a68c09e 100644
--- a/ipmitool.changes
+++ b/ipmitool.changes
@@ -27,6 +27,9 @@ D    lanplus-don-t-retry-pre-session-Get-cipher-suites.patch
 - Config file in /etc must not be executable
   /etc/bmc-snmp-proxy
 
+- Enhance _service file to always get latest sources and get the
+  version correctly parsed
+
 -------------------------------------------------------------------
 Tue May 25 17:59:48 UTC 2021 - Thomas Renninger <trenn@suse.de>
 
diff --git a/ipmitool.obsinfo b/ipmitool.obsinfo
new file mode 100644
index 0000000..15b29eb
--- /dev/null
+++ b/ipmitool.obsinfo
@@ -0,0 +1,5 @@
+name: ipmitool
+version: 1.8.18.237.g11c7605
+mtime: 1624395349
+commit: 11c7605c0d5423f90f399f5e830d1095089f38a1
+
diff --git a/ipmitool.spec b/ipmitool.spec
index b056e91..f8113a2 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -17,7 +17,7 @@
 
 
 Name:           ipmitool
-Version:        1.8.18+git20210622.11c7605
+Version:        1.8.18.237.g11c7605
 Release:        0
 Summary:        Utility for IPMI Control
 License:        BSD-3-Clause