From 6a376b97a448afca38a8b2dd1d1a23bdefc11d23d224632940d6fde106ca8374 Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Wed, 9 Aug 2017 22:19:01 +0000
Subject: [PATCH] Accepting request 515239 from
 home:jengelh:branches:Base:System

- Fix RPM groups. Replace %__-type macro indirections and
  old $RPM shell variables.

OBS-URL: https://build.opensuse.org/request/show/515239
OBS-URL: https://build.opensuse.org/package/show/Base:System/open-isns?expand=0&rev=11
---
 open-isns.changes |  6 ++++++
 open-isns.spec    | 17 ++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/open-isns.changes b/open-isns.changes
index 5d72bd3..737cbd1 100644
--- a/open-isns.changes
+++ b/open-isns.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Aug  8 19:18:27 UTC 2017 - jengelh@inai.de
+
+- Fix RPM groups. Replace %__-type macro indirections and
+  old $RPM shell variables.
+
 -------------------------------------------------------------------
 Wed Nov  2 23:53:06 UTC 2016 - lduncan@suse.com
 
diff --git a/open-isns.spec b/open-isns.spec
index 634f529..91c5af0 100644
--- a/open-isns.spec
+++ b/open-isns.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package open-isns
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 Name:           open-isns
 Summary:        Partial Implementation of iSNS iSCSI registration
 License:        LGPL-2.1+
-Group:          System Environment/Kernel
+Group:          System/Kernel
 Version:        0.97
 Release:        0
 Source:         %{name}-%{version}.tar.gz
@@ -61,17 +61,16 @@ Files to develop an application using the open-isns library.
 autoconf
 autoheader
 %configure --prefix=%{_prefix} 
-%{__make} OPTFLAGS="${RPM_OPT_FLAGS}"
+make OPTFLAGS="%{optflags}"
 
 %install
-%{__make} DESTDIR=${RPM_BUILD_ROOT} install
-if [ ! -d ${RPM_BUILD_ROOT}/usr/sbin ] ; then
-	mkdir -p ${RPM_BUILD_ROOT}/usr/sbin
+make DESTDIR="%{buildroot}" install
+if [ ! -d "%{buildroot}/usr/sbin" ] ; then
+	mkdir -p %{buildroot}/usr/sbin
 fi
-ln -sf /usr/sbin/service ${RPM_BUILD_ROOT}/usr/sbin/rcisnsd
+ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcisnsd
 install -vD %{S:1} %{buildroot}/etc/sysconfig/SuSEfirewall2.d/services/isns
-%{__make} DESTDIR=${RPM_BUILD_ROOT} install_hdrs
-%{__make} DESTDIR=${RPM_BUILD_ROOT} install_lib
+make DESTDIR="%{buildroot}" install_hdrs install_lib
 
 %post
 %{service_add_post isnsd.socket isnsd.service}