From 37f6bdc37fbedb96cde7b93d6d59155d8f9f84b7e16660e472911f22d459ee69 Mon Sep 17 00:00:00 2001
From: Christian Goll <cgoll@suse.com>
Date: Thu, 15 Dec 2022 09:50:46 +0000
Subject: [PATCH] Accepting request 1042412 from
 home:aginies:branches:network:cluster

- update to version 0.3.1:
  * Fixed username/password use in libipmiconsole.conf. (e59f5e4)
  * Added more console logfile conversion specifiers. (96ede96, 5a189f6)
  * Added conmen '-T' cmdline opt to specify terminal emulator. (a11c6f4)
  * Added rpm source file verification. (f86c123)
  * Revamped autotools config. (547db3c)
  * Added configure opts for systemd/sysvinit. (3e303e6)
  * Added configure runstatedir support. (bb415e0)
  * Fixed installation directory variable substitution. (7642609)
  * Removed autotools-generated files from version control. (44168a4)
  * general move of files from /usr/lib/conman to /usr/share/conman

OBS-URL: https://build.opensuse.org/request/show/1042412
OBS-URL: https://build.opensuse.org/package/show/network:cluster/conman?expand=0&rev=43
---
 conman-0.3.0.tar.gz                  |  3 ---
 conman-0.3.1.tar.gz                  |  3 +++
 conman-suse-fix-expect-scripts.patch |  6 +++---
 conman.changes                       | 15 +++++++++++++++
 conman.spec                          | 21 ++++++++++++---------
 5 files changed, 33 insertions(+), 15 deletions(-)
 delete mode 100644 conman-0.3.0.tar.gz
 create mode 100644 conman-0.3.1.tar.gz

diff --git a/conman-0.3.0.tar.gz b/conman-0.3.0.tar.gz
deleted file mode 100644
index 5818cc8..0000000
--- a/conman-0.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:51d379187028317784305588ce3770e66d56c201c3d98afbf823eac039f4583c
-size 240855
diff --git a/conman-0.3.1.tar.gz b/conman-0.3.1.tar.gz
new file mode 100644
index 0000000..e2c52e8
--- /dev/null
+++ b/conman-0.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd47d3d9a72579b470dd73d85cd3fec606fa5659c728ff3c1c57e970f4da72a2
+size 169716
diff --git a/conman-suse-fix-expect-scripts.patch b/conman-suse-fix-expect-scripts.patch
index 3778d1e..dd2fbe3 100644
--- a/conman-suse-fix-expect-scripts.patch
+++ b/conman-suse-fix-expect-scripts.patch
@@ -1,7 +1,7 @@
-Index: conman-0.2.7/lib/exec/ssh.exp
+Index: conman-0.2.7/scripts/exec/ssh.exp
 ===================================================================
---- conman-0.2.7.orig/lib/exec/ssh.exp
-+++ conman-0.2.7/lib/exec/ssh.exp
+--- conman-0.2.7.orig/scripts/exec/ssh.exp
++++ conman-0.2.7/scripts/exec/ssh.exp
 @@ -166,7 +166,7 @@ expect {
      }
      exp_continue -continue_timer
diff --git a/conman.changes b/conman.changes
index 902ef02..67e332c 100644
--- a/conman.changes
+++ b/conman.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Dec 12 13:33:27 UTC 2022 - Antoine Ginies <aginies@suse.com>
+
+- update to version 0.3.1:
+  * Fixed username/password use in libipmiconsole.conf. (e59f5e4)
+  * Added more console logfile conversion specifiers. (96ede96, 5a189f6)
+  * Added conmen '-T' cmdline opt to specify terminal emulator. (a11c6f4)
+  * Added rpm source file verification. (f86c123)
+  * Revamped autotools config. (547db3c)
+  * Added configure opts for systemd/sysvinit. (3e303e6)
+  * Added configure runstatedir support. (bb415e0)
+  * Fixed installation directory variable substitution. (7642609)
+  * Removed autotools-generated files from version control. (44168a4)
+  * general move of files from /usr/lib/conman to /usr/share/conman
+
 -------------------------------------------------------------------
 Fri Oct 15 16:11:42 UTC 2021 - Egbert Eich <eich@suse.com>
 
diff --git a/conman.spec b/conman.spec
index 23a420b..1a79787 100644
--- a/conman.spec
+++ b/conman.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package conman
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -45,7 +45,7 @@
 %endif
 
 Name:           conman
-Version:        0.3.0
+Version:        0.3.1
 Release:        0
 
 Summary:        The Console Manager
@@ -63,13 +63,15 @@ BuildRequires:  freeipmi-devel
 Source0:        https://github.com/dun/conman/archive/%{name}-%{version}.tar.gz
 Source1:        %{name}.service.in
 %if 0%{?have_systemd}
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  pkgconfig(systemd)
 %{?have_sysuser:BuildRequires:  sysuser-tools}
 %{?systemd_requires}
 Requires(pre):  shadow
 Requires(post): %fillup_prereq sed
-Requires(postun): coreutils
+Requires(postun):coreutils
 %endif
 
 Patch1:         conman-suse-fix-expect-scripts.patch
@@ -99,6 +101,7 @@ Its features include:
 %patch1 -p1
 
 %build
+./bootstrap
 %configure --with-tcp-wrappers \
 %if 0%{?have_freeipmi}
            --with-freeipmi \
@@ -123,9 +126,9 @@ ln -s %{_sysconfdir}/init.d/conman %{buildroot}%{_sbindir}/rcconman
 chmod u+x %{buildroot}%{_sysconfdir}/init.d/conman
 %endif
 mkdir -p %{buildroot}%{_fillupdir}
-mv %{buildroot}%{_sysconfdir}/sysconfig/conman \
+mv etc/conman.sysconfig \
     %{buildroot}%{_fillupdir}/sysconfig.conman
-for i in $(find %{buildroot}/usr/lib/conman) ; do
+for i in $(find %{buildroot}/usr/share/conman) ; do
   if [ -f $i -a -x $i ]; then
      if ! head -1 $i | grep "^#!"; then
 	 echo "#!/usr/bin/expect -f" > /tmp/$(basename $i)
@@ -218,9 +221,9 @@ touch %_localstatedir/lib/conman/%migrated || :
 %endif
 
 %if 0%{?sle_version} > 120200 || 0%{?suse_version} > 1320
-%define files_license %license 
-%else 
-%define files_license %doc 
+%define files_license %license
+%else
+%define files_license %doc
 %endif
 
 %files
@@ -243,7 +246,7 @@ touch %_localstatedir/lib/conman/%migrated || :
 %{_fillupdir}/sysconfig.conman
 %{_bindir}/*
 %{_sbindir}/*
-%{_prefix}/lib/conman
+%{_prefix}/share/conman
 %if 0%{?have_systemd}
 %{_prefix}/lib/systemd/*
 %else