[sblim-cmpi-base] Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel
vcrhonek
vcrhonek at fedoraproject.org
Thu Feb 26 15:27:13 UTC 2015
commit 0442ab0d1d124e09edd8abbb311eb8a2b01bf001
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Thu Feb 26 16:26:51 2015 +0100
Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel
sblim-cmpi-base.spec | 88 ++++------------------------------------------------
1 file changed, 6 insertions(+), 82 deletions(-)
---
diff --git a/sblim-cmpi-base.spec b/sblim-cmpi-base.spec
index ab76a27..cbc71c3 100644
--- a/sblim-cmpi-base.spec
+++ b/sblim-cmpi-base.spec
@@ -92,100 +92,24 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/cmpi/*a
%{_datadir}/sblim-testsuite/system/linux/*.pl
%global SCHEMA %{_datadir}/%{name}/Linux_Base.mof %{_datadir}/%{name}/Linux_BaseIndication.mof
+
%global REGISTRATION %{_datadir}/%{name}/Linux_BaseIndication.registration
%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
- 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 Feb 19 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.4-2
+* Thu Feb 26 2015 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.4-2
- Update provider registration script to use systemctl to stop/start sfcb
+- Use new macros for %%pre/%%post/%%preun from sblim-cmpi-devel
* Wed Oct 29 2014 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.6.4-1
- Update to sblim-cmpi-base-1.6.4
More information about the scm-commits
mailing list