[sblim-cmpi-params] Update provider registration script to use systemctl to stop/start sfcb, Use new macros for %%pre/%%

[vcrhonek]

commit 4604f0df14bee7462f7784f7d420c7f3aef1a6da
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Thu Mar 5 11:00:57 2015 +0100

    Update provider registration script to use systemctl to stop/start sfcb, Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel

 ...m-cmpi-params-1.3.0-prov-reg-sfcb-systemd.patch | 42 +++++++++
 sblim-cmpi-params.spec                             | 99 +++-------------------
 2 files changed, 53 insertions(+), 88 deletions(-)
---
diff --git a/sblim-cmpi-params-1.3.0-prov-reg-sfcb-systemd.patch b/sblim-cmpi-params-1.3.0-prov-reg-sfcb-systemd.patch
new file mode 100644
index 0000000..915f09e
--- /dev/null
+++ b/sblim-cmpi-params-1.3.0-prov-reg-sfcb-systemd.patch
@@ -0,0 +1,42 @@
+diff -up sblim-cmpi-params-1.3.0/provider-register.sh.orig sblim-cmpi-params-1.3.0/provider-register.sh
+--- sblim-cmpi-params-1.3.0/provider-register.sh.orig	2015-03-03 12:08:42.605374010 +0100
++++ sblim-cmpi-params-1.3.0/provider-register.sh	2015-03-03 12:09:42.283632495 +0100
+@@ -351,20 +351,8 @@ sfcb_rebuild()
+     if ps -C sfcbd > /dev/null 2>&1
+     then
+         # sfcb is running -- need to restart
+-	for INITSCRIPT in /etc/init.d/sfcb /usr/local/etc/init.d/sfcb none
+-	do
+-	  if test -x $INITSCRIPT
+-	  then
+-	      break;
+-	  fi
+-	done
+ 	chatter "Shutting down sfcb."
+-	if test $INITSCRIPT = none
+-	then
+-	    killall sfcbd
+-	else
+-	    $INITSCRIPT stop
+-	fi
++	systemctl stop sblim-sfcb
+ 	t=0
+ 	while ps -C sfcbd > /dev/null 2>&1
+ 	do
+@@ -385,14 +373,8 @@ sfcb_rebuild()
+ 	    return 1
+ 	fi
+ 	
+-	if test $INITSCRIPT = none
+-	then
+-	    echo "No init script found - you need to start sfcbd manually." >&2
+-	    return 1
+-	else
+-	    chatter "Restarting sfcb."
+-	    $INITSCRIPT start
+-	fi
++	chatter "Restarting sfcb."
++	systemctl start sblim-sfcb
+     else
+ 	# Not running - rebuild repository
+ 	chatter "Rebuilding repository."
diff --git a/sblim-cmpi-params.spec b/sblim-cmpi-params.spec
index 6a9f839..2419115 100644
--- a/sblim-cmpi-params.spec
+++ b/sblim-cmpi-params.spec
@@ -2,7 +2,7 @@
 
 Name:           sblim-cmpi-params
 Version:        1.3.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        SBLIM params instrumentation
 
 Group:          Applications/System
@@ -14,6 +14,8 @@ Patch0:         sblim-cmpi-params-1.2.4-no-abi-params.patch
 Patch1:         sblim-cmpi-params-1.3.0-docdir.patch
 # Patch2: use Pegasus root/interop instead of root/PG_Interop
 Patch2:         sblim-cmpi-params-1.3.0-pegasus-interop.patch
+# Patch3: call systemctl in provider registration
+Patch3:         sblim-cmpi-params-1.3.0-prov-reg-sfcb-systemd.patch
 
 BuildRequires:  sblim-cmpi-devel sblim-cmpi-base-devel
 Requires:       sblim-cmpi-base cim-server cim-schema
@@ -35,6 +37,7 @@ SBLIM Base Params Testcase Files for SBLIM Testsuite
 %patch0 -p1 -b .no-abi-params
 %patch1 -p1 -b .docdir
 %patch2 -p1 -b .pegasus-interop
+%patch3 -p1 -b .prov-reg-sfcb-systemd
 
 %build
 %configure \
@@ -59,103 +62,23 @@ rm -f $RPM_BUILD_ROOT/%{provider_dir}/*.la
 
 %global SCHEMA %{_datadir}/%{name}/*.mof
 %global REGISTRATION %{_datadir}/%{name}/*.registration
-%global PEGASUS_MOF CIM_UnixLocalFileSystem
 
 %pre
-function unregister()
-{
-  %{_datadir}/%{name}/provider-register.sh -d \
-        $1 \
-        -m %{SCHEMA} \
-        -r %{REGISTRATION} > /dev/null 2>&1 || :;
-  # don't let registration failure when server not running fail upgrade!
-}
- 
-# If upgrading, deregister old version
-if [ $1 -gt 1 ]
-then
-        unregistered=no
-        if [ -e /usr/sbin/cimserver ]; then
-           unregister "-t pegasus";
-           unregistered=yes
-        fi
- 
-        if [ -e /usr/sbin/sfcbd ]; then
-           unregister "-t sfcb";
-           unregistered=yes
-        fi
- 
-        if [ "$unregistered" != yes ]; then
-           unregister
-        fi
-fi
+%sblim_pre
 
 %post
-function register()
-{
-  # The follwoing script will handle the registration for various CIMOMs.
-  %{_datadir}/%{name}/provider-register.sh \
-        $1 \
-        -m %{SCHEMA} \
-        -r %{REGISTRATION} > /dev/null 2>&1 || :;
-  # don't let registration failure when server not running fail install!
-}
- 
-/sbin/ldconfig
-if [ $1 -ge 1 ]
-then
-        registered=no
-        if [ -e /usr/sbin/cimserver ]; then
-          # tog-pegasus needs some schemes registered first
-          if [ -x /usr/bin/peg-loadmof.sh ]; then
-            peg-loadmof.sh -n root/cimv2 /usr/share/mof/cim-current/*/{%{PEGASUS_MOF}}.mof > /dev/null 2>&1 || :;
-            /sbin/service tog-pegasus try-restart > /dev/null 2>&1 || :;
-          fi
-          register "-t pegasus";
-          registered=yes
-        fi
- 
-        if [ -e /usr/sbin/sfcbd ]; then
-          register "-t sfcb";
-          registered=yes
-        fi
- 
-        if [ "$registered" != yes ]; then
-          register
-        fi
-fi
+%sblim_post
 
 %preun
-function unregister()
-{
-  %{_datadir}/%{name}/provider-register.sh -d \
-        $1 \
-        -m %{SCHEMA} \
-        -r %{REGISTRATION} > /dev/null 2>&1 || :;
-  # don't let registration failure when server not running fail erase!
-}
- 
-if [ $1 -eq 0 ]
-then
-        unregistered=no
-        if [ -e /usr/sbin/cimserver ]; then
-          unregister "-t pegasus";
-          unregistered=yes
-        fi
- 
-        if [ -e /usr/sbin/sfcbd ]; then
-          unregister "-t sfcb";
-          unregistered=yes
-        fi
- 
-        if [ "$unregistered" != yes ]; then
-          unregister
-        fi
-fi
+%sblim_preun
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Mar 05 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.3.0-12
+- Update provider registration script to use systemctl to stop/start sfcb
+- Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild