[sblim-cmpi-dns] Fix registration, Use sblim-sfcb

[vcrhonek]

commit 9278c22fbf97cd564141bd67c165a7ab2eb421e4
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Tue Nov 22 15:08:35 2011 +0100

    Fix registration, Use sblim-sfcb

 sblim-cmpi-dns.spec |   26 +++++++++++++++-----------
 1 files changed, 15 insertions(+), 11 deletions(-)
---
diff --git a/sblim-cmpi-dns.spec b/sblim-cmpi-dns.spec
index a232ad0..cb30bcd 100644
--- a/sblim-cmpi-dns.spec
+++ b/sblim-cmpi-dns.spec
@@ -3,7 +3,7 @@
 
 Name:           sblim-cmpi-dns
 Version:        1.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        SBLIM WBEM-SMT Dns
 
 Group:          Applications/System
@@ -16,7 +16,8 @@ Patch0:         sblim-cmpi-dns-0.5.2-include.patch
 #BuildRequires:  sed
 BuildRequires:  flex bison
 BuildRequires:  sblim-tools-libra-devel
-BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
+#BuildRequires:  tog-pegasus-devel >= %{tog_pegasus_version}
+BuildRequires:  sblim-sfcb
 BuildRequires:  sblim-cmpi-devel
 Requires:       sblim-tools-libra
 Requires:       bind
@@ -24,7 +25,8 @@ Requires:       /etc/ld.so.conf.d
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Provides:       cmpi-dns = %{version}
-Requires:       tog-pegasus >= %{tog_pegasus_version}
+#Requires:       tog-pegasus >= %{tog_pegasus_version}
+Requires:       sblim-sfcb
 
 %description
 The cmpi-dns package provides access to the dns configuration data
@@ -36,7 +38,6 @@ Resource Access.
 Summary:        SBLIM WBEM-SMT Dns - Header Development Files
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       tog-pegasus >= %{tog_pegasus_version}
 
 %description devel
 SBLIM WBEM-SMT Dns Development Package contains header files and
@@ -47,7 +48,6 @@ Summary:        SBLIM WBEM-SMT Dns - Testcase Files
 Group:          Applications/System
 Requires:       %{name} = %{version}-%{release}
 Requires:       sblim-testsuite
-Requires:       tog-pegasus >= %{tog_pegasus_version}
 
 %description test
 SBLIM WBEM-SMT DNS Provider Testcase Files for the SBLIM Testsuite
@@ -64,7 +64,7 @@ export CFLAGS="$RPM_OPT_FLAGS"
 %endif
 %configure \
    TESTSUITEDIR=%{_datadir}/sblim-testsuite \
-   CIMSERVER=pegasus \
+   CIMSERVER=sfcb \
    PROVIDERDIR=%{provider_dir}
 # try to remove RPATH from libtool generated libraries
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -121,14 +121,14 @@ sed -i -e '1d;2i#!/usr/bin/awk -f' $RPM_BUILD_ROOT/%{_datadir}/%{name}/smt_dns_r
 %{_datadir}/sblim-testsuite/cim/Linux_Dns*
 
 # Conditional definition of schema and registration files
-%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns.mof
-%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns.registration
+%define DNS_SCHEMA %{_datadir}/%{name}/Linux_Dns_Profile.mof %{_datadir}/%{name}/Linux_Dns.mof
+%define DNS_REGISTRATION %{_datadir}/%{name}/Linux_Dns_Profile.registration %{_datadir}/%{name}/Linux_Dns.registration
 
 %pre
 # If upgrading, deregister old version
 if [ $1 -gt 1 ]; then
   %{_datadir}/%{name}/provider-register.sh -d \
-  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
+  -t sfcb -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
 fi
 
 %post
@@ -136,14 +136,14 @@ fi
 if [ $1 -ge 1 ]; then
   # Register Schema and Provider - this is higly provider specific
   %{_datadir}/%{name}/provider-register.sh \
-  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
+  -t sfcb -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
 fi;
 
 %preun
 # Deregister only if not upgrading 
 if [ $1 -eq 0 ]; then
   %{_datadir}/%{name}/provider-register.sh -d \
-  -t pegasus -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
+  -t sfcb -r %{DNS_REGISTRATION} -m %{DNS_SCHEMA} > /dev/null 2>&1 || :;
 fi
 
 %postun
@@ -156,6 +156,10 @@ fi
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Tue Nov 22 2011 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0-3
+- Fix registration
+- Use sblim-sfcb
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild