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

[vcrhonek]

commit f40e74de26694c6e951d58f9289af3902f39292a
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Tue Mar 3 10:44:51 2015 +0100

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

 ...-cmpi-network-1.4.0-prov-reg-sfcb-systemd.patch | 42 +++++++++++++++++++
 sblim-cmpi-network.spec                            | 49 +++++++---------------
 2 files changed, 57 insertions(+), 34 deletions(-)
---
diff --git a/sblim-cmpi-network-1.4.0-prov-reg-sfcb-systemd.patch b/sblim-cmpi-network-1.4.0-prov-reg-sfcb-systemd.patch
new file mode 100644
index 0000000..351dde1
--- /dev/null
+++ b/sblim-cmpi-network-1.4.0-prov-reg-sfcb-systemd.patch
@@ -0,0 +1,42 @@
+diff -up sblim-cmpi-network-1.4.0/provider-register.sh.orig sblim-cmpi-network-1.4.0/provider-register.sh
+--- sblim-cmpi-network-1.4.0/provider-register.sh.orig	2015-02-25 13:28:11.472060404 +0100
++++ sblim-cmpi-network-1.4.0/provider-register.sh	2015-02-25 13:29:03.086241685 +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-network.spec b/sblim-cmpi-network.spec
index 8608557..a323533 100644
--- a/sblim-cmpi-network.spec
+++ b/sblim-cmpi-network.spec
@@ -2,7 +2,7 @@
 
 Name:           sblim-cmpi-network
 Version:        1.4.0
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        SBLIM Network Instrumentation
 
 Group:          Applications/System
@@ -15,6 +15,8 @@ Patch0:         sblim-cmpi-network-1.4.0-network-devices-arbitrary-names-support
 Patch1:         sblim-cmpi-network-1.4.0-docdir.patch
 # Patch2: use Pegasus root/interop instead of root/PG_Interop
 Patch2:         sblim-cmpi-network-1.4.0-pegasus-interop.patch
+# Patch3: call systemctl in provider registration
+Patch3:         sblim-cmpi-network-1.4.0-prov-reg-sfcb-systemd.patch
 
 BuildRequires:  sblim-cmpi-base-devel >= 1.5 sblim-cmpi-devel
 Requires:       sblim-cmpi-base >= 1.5 cim-server cim-schema
@@ -43,6 +45,7 @@ SBLIM Base Network Testcase Files for SBLIM Testsuite
 %patch0 -p1 -b .network-devices-arbitrary-names-support
 %patch1 -p1 -b .docdir
 %patch2 -p1 -b .pegasus-interop
+%patch3 -p1 -b .prov-reg-sfcb-systemd
 
 %build
 %ifarch s390 s390x ppc ppc64
@@ -70,7 +73,6 @@ echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
 %files
 %doc AUTHORS COPYING DEBUG README README.TEST README.tog-pegasus
 %{_datadir}/%{name}
-%{_datadir}
 %{_libdir}/*.so.*
 %{provider_dir}/*.so
 %config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
@@ -82,48 +84,27 @@ echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_
 %files test
 %{_datadir}/sblim-testsuite
 
-%global PEGASUS_MOF CIM_IPProtocolEndpoint,CIM_NetworkPort,CIM_EthernetPort,CIM_TokenRingPort,CIM_PortImplementsEndpoint
+%global SCHEMA %{_datadir}/%{name}/Linux_Network.mof
+
+%global REGISTRATION %{_datadir}/%{name}/Linux_Network.registration
 
 %pre
-if [ "$1" -gt 1 ]; then
-# If upgrading, deregister old version
-    %{_datadir}/%{name}/provider-register.sh -d \
-        -t sfcb \
-        -m %{_datadir}/%{name}/*.mof \
-        -r %{_datadir}/%{name}/*.registration \
-        > /dev/null 2>&1 || :;
-fi
+%sblim_pre
 
 %post
-/sbin/ldconfig
-# Register Schema and Provider - this is higly provider specific  
-# 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
-    %{_datadir}/%{name}/provider-register.sh \
-        -t sfcb \
-        -m %{_datadir}/%{name}/*.mof \
-        -r %{_datadir}/%{name}/*.registration \
-        > /dev/null 2>&1 || :;
-fi
+%sblim_post
 
 %preun
-if [ "$1" -eq 0 ]; then
-# Deregister only if not upgrading
-    %{_datadir}/%{name}/provider-register.sh -d \
-        -t sfcb \
-        -m %{_datadir}/%{name}/*.mof \
-        -r %{_datadir}/%{name}/*.registration \
-        > /dev/null 2>&1 || :;
-fi
+%sblim_preun
 
 %postun -p /sbin/ldconfig
 
 %changelog
+* Tue Mar 03 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.4.0-14
+- Update provider registration script to use systemctl to stop/start sfcb
+- Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel
+- Fix packaging of -test
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild