From 80aca1ab6f46439920a8447a8011b44af4655aca818585077f09906c19517d2f Mon Sep 17 00:00:00 2001
From: Thomas Renninger <trenn@suse.com>
Date: Tue, 2 Oct 2018 09:31:46 +0000
Subject: [PATCH] - No sever build service errors/warnings -> remove
 openhpi-rpmlintrc D openhpi-rpmlintrc - Remove has_systemd checks - Disable
 ipmi plugin (deprecated) -> ipmidirect up-to-date - Still add a patch that
 ipmi plugin would still build: A fix_openipmi_typedef_selector_change.patch

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/openhpi?expand=0&rev=38
---
 openhpi-3.6.0_fix_net-snmp_disable_MD5.patch | 23 --------------------
 openhpi-rpmlintrc                            |  4 ----
 openhpi.changes                              |  6 +++++
 openhpi.spec                                 |  9 +-------
 4 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 openhpi-3.6.0_fix_net-snmp_disable_MD5.patch
 delete mode 100644 openhpi-rpmlintrc

diff --git a/openhpi-3.6.0_fix_net-snmp_disable_MD5.patch b/openhpi-3.6.0_fix_net-snmp_disable_MD5.patch
deleted file mode 100644
index 1b74ad7..0000000
--- a/openhpi-3.6.0_fix_net-snmp_disable_MD5.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -Nurp openhpi-3.6.0-orig/plugins/snmp_bc/snmp_bc_session.c openhpi-3.6.0/plugins/snmp_bc/snmp_bc_session.c
---- openhpi-3.6.0-orig/plugins/snmp_bc/snmp_bc_session.c	2015-09-17 12:40:43.357513842 +0200
-+++ openhpi-3.6.0/plugins/snmp_bc/snmp_bc_session.c	2015-09-17 13:54:53.386358885 +0200
-@@ -201,14 +201,17 @@ void *snmp_bc_open(GHashTable *handler_c
- 				}
- 				
- 				custom_handle->session.securityLevel = SNMP_SEC_LEVEL_AUTHNOPRIV;
-+#ifndef DISABLE_MD5
- 				if (!authtype || !g_ascii_strncasecmp(authtype, "MD5", sizeof("MD5"))) {
- 					custom_handle->session.securityAuthProto = usmHMACMD5AuthProtocol;
- 					custom_handle->session.securityAuthProtoLen = USM_AUTH_PROTO_MD5_LEN;
--				} else if (!g_ascii_strncasecmp(authtype, "SHA", sizeof("SHA"))) {
-+				} else 
-+#endif
-+				if (!g_ascii_strncasecmp(authtype, "SHA", sizeof("SHA"))) {
- 					custom_handle->session.securityAuthProto = usmHMACSHA1AuthProtocol;
- 					custom_handle->session.securityAuthProtoLen = USM_AUTH_PROTO_SHA_LEN;
- 				} else {
--					err("Unrecognized authenication type=%s.", authtype); 
-+					err("Unrecognized or unsupported authenication type=%s.", authtype); 
- 					return NULL;
- 				}
- 				
diff --git a/openhpi-rpmlintrc b/openhpi-rpmlintrc
deleted file mode 100644
index f02dd51..0000000
--- a/openhpi-rpmlintrc
+++ /dev/null
@@ -1,4 +0,0 @@
-addFilter("incoherent-init-script-name")
-addFilter("shlib-policy-missing-suffix")
-addFilter("shlib-policy-nonversioned-dir")
-addFilter("devel-file-in-non-devel-package")
diff --git a/openhpi.changes b/openhpi.changes
index 1ff73ca..0219313 100644
--- a/openhpi.changes
+++ b/openhpi.changes
@@ -9,6 +9,12 @@ Wed Sep 26 14:25:38 UTC 2018 - trenn@suse.de
 - Patch mainline:
 D openhpi-3.6.0_fix_net-snmp_disable_MD5.patch
 - Used spec-cleaner
+- No sever build service errors/warnings -> remove openhpi-rpmlintrc
+D openhpi-rpmlintrc
+- Remove has_systemd checks
+- Disable ipmi plugin (deprecated) -> ipmidirect up-to-date
+- Still add a patch that ipmi plugin would still build:
+A fix_openipmi_typedef_selector_change.patch
 
 -------------------------------------------------------------------
 Fri Feb 24 16:32:49 UTC 2017 - kkaempf@suse.com
diff --git a/openhpi.spec b/openhpi.spec
index ba79065..db80c1a 100644
--- a/openhpi.spec
+++ b/openhpi.spec
@@ -16,9 +16,6 @@
 #
 
 
-%if 0%{?suse_version} > 1140
-%define has_systemd 1
-%endif
 Name:           openhpi
 Version:        3.8.0
 Release:        0
@@ -31,6 +28,7 @@ Source:         openhpi-%{version}.tar.xz
 Source2:        AUTHORS
 Patch0:         unlink-pidfile-on-error.patch
 Patch2:         openhpi-3.4.0-systemd.patch
+Patch3:         fix_openipmi_typedef_selector_change.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  docbook-toys
@@ -128,7 +126,6 @@ out the status page.
 %autopatch -p1
 
 %build
-#cp %{S:2} .
 autoreconf -fiv
 
 # fix permissions
@@ -203,11 +200,7 @@ echo "Check OPENHPI_UNCONFIGURED in %{_sysconfdir}/openhpi/openhpi.conf"
 
 %files daemon
 %doc README.daemon
-%if 0%{?has_systemd}
 %{_unitdir}/openhpid.service
-%else
-%{_initddir}/openhpid
-%endif
 %{_sbindir}/openhpid
 %{_sbindir}/rcopenhpid
 %{_mandir}/man8/openhpid.8%{?ext_man}