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

[vcrhonek]

commit b5cf201af9595a2bca67ef1ee2cebac617abd355
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Mon Mar 2 16:19:19 2015 +0100

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

 sblim-cmpi-nfsv4-1.1.0-prov-reg-sfcb-systemd.patch | 42 +++++++++++++++++++++
 sblim-cmpi-nfsv4.spec                              | 43 +++++++---------------
 2 files changed, 56 insertions(+), 29 deletions(-)
---
diff --git a/sblim-cmpi-nfsv4-1.1.0-prov-reg-sfcb-systemd.patch b/sblim-cmpi-nfsv4-1.1.0-prov-reg-sfcb-systemd.patch
new file mode 100644
index 0000000..ca12fee
--- /dev/null
+++ b/sblim-cmpi-nfsv4-1.1.0-prov-reg-sfcb-systemd.patch
@@ -0,0 +1,42 @@
+diff -up sblim-cmpi-nfsv4-1.1.0/provider-register.sh.orig sblim-cmpi-nfsv4-1.1.0/provider-register.sh
+--- sblim-cmpi-nfsv4-1.1.0/provider-register.sh.orig	2015-02-25 15:18:30.894034096 +0100
++++ sblim-cmpi-nfsv4-1.1.0/provider-register.sh	2015-02-25 15:21:26.795644407 +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-nfsv4.spec b/sblim-cmpi-nfsv4.spec
index 1dc7694..5c2b168 100644
--- a/sblim-cmpi-nfsv4.spec
+++ b/sblim-cmpi-nfsv4.spec
@@ -3,7 +3,7 @@
 Name:           sblim-cmpi-nfsv4
 Summary:        SBLIM nfsv4 instrumentation
 Version:        1.1.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 License:        EPL
 Group:          Applications/System
 URL:            http://sourceforge.net/projects/sblim/
@@ -13,6 +13,8 @@ Source0:        http://downloads.sourceforge.net/project/sblim/providers/%{name}
 Patch0:         sblim-cmpi-nfsv4-1.1.0-docdir.patch
 # Patch1: use Pegasus root/interop instead of root/PG_Interop
 Patch1:         sblim-cmpi-nfsv4-1.1.0-pegasus-interop.patch
+# Patch2: call systemctl in provider registration
+Patch2:         sblim-cmpi-nfsv4-1.1.0-prov-reg-sfcb-systemd.patch
 
 BuildRequires:  sblim-cmpi-base-devel sblim-cmpi-devel
 Requires:       sblim-cmpi-base cim-server cim-schema
@@ -45,6 +47,7 @@ SBLIM Base Fsvol Testcase Files for SBLIM Testsuite
 %setup -q
 %patch0 -p1 -b .docdir
 %patch1 -p1 -b .pegasus-interop
+%patch2 -p1 -b .prov-reg-sfcb-systemd
 
 %build
 %ifarch s390 s390x ppc ppc64
@@ -80,44 +83,26 @@ mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv4SystemConfigurationUtil.so $RPM_BUIL
 %files test
 %{_datadir}/sblim-testsuite
 
-%global PEGASUS_MOF CIM_SystemSetting,CIM_NFS,CIM_SystemConfiguration,CIM_SystemSettingContext
+%global SCHEMA %{_datadir}/%{name}/Linux_NFSv4SystemSetting.mof %{_datadir}/%{name}/Linux_NFSv4SystemConfiguration.mof
+
+%global REGISTRATION %{_datadir}/%{name}/Linux_NFSv4SystemSetting.registration %{_datadir}/%{name}/Linux_NFSv4SystemConfiguration.registration
 
 %pre
-# If upgrading, deregister old version
-if [ $1 -gt 1 ]; then
-  %{_datadir}/%{name}/provider-register.sh -d \
-    -r %{_datadir}/%{name}/*.registration \
-    -m %{_datadir}/%{name}/*.mof \
-    > /dev/null 2>&1 || :;
-fi
+%sblim_pre
 
 %post
-/sbin/ldconfig
-# 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
-if [ $1 -ge 1 ]; then
-# Register Schema and Provider - this is higly provider specific
-  %{_datadir}/%{name}/provider-register.sh \
-    -r %{_datadir}/%{name}/*.registration \
-    -m %{_datadir}/%{name}/*.mof \
-    > /dev/null 2>&1 || :;
-fi;
+%sblim_post
 
 %preun
-# Deregister only if not upgrading 
-if [ $1 -eq 0 ]; then
-  %{_datadir}/%{name}/provider-register.sh -d \
-    -r %{_datadir}/%{name}/*.registration \
-    -m %{_datadir}/%{name}/*.mof \
-    > /dev/null 2>&1 || :;
-fi
+%sblim_preun
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Mon Mar 02 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.1.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.1.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild