Hello community, here is the log from the commit of package sblim-cmpi-dhcp checked in at Sat Sep 13 12:10:46 CEST 2008. -------- --- sblim-cmpi-dhcp/sblim-cmpi-dhcp.changes 2008-08-18 16:54:33.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-cmpi-dhcp/sblim-cmpi-dhcp.changes 2008-09-12 15:43:19.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 12 15:43:14 CEST 2008 - mmarek@suse.cz + +- switch to sfcb + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-dhcp.spec ++++++ --- /var/tmp/diff_new_pack.sH6571/_old 2008-09-13 12:09:58.000000000 +0200 +++ /var/tmp/diff_new_pack.sH6571/_new 2008-09-13 12:09:58.000000000 +0200 @@ -23,7 +23,7 @@ BuildRequires: bison flex sblim-cmpi-base-devel sblim-cmpi-devel sblim-testsuite sblim-tools-libra-devel Summary: SBLIM CMPI dhcp Instrumentation Version: 0.5.5 -Release: 2 +Release: 11 Group: System/Management License: IBM Public License; Common Public License 1.0, Eclipse Public License Requires: sblim-cmpi-base >= 1.2.3, cim-server @@ -31,7 +31,7 @@ Patch1: sblim-cmpi-dhcp-0.5.5-open-missing-mode.patch Patch2: sblim-cmpi-dhcp-0.5.5-paths.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: /usr/bin/loadmof.sh, /usr/bin/rmmof.sh +PreReq: sblim-sfcb %description Standards Based Linux dhcp Instrumentation Providers @@ -63,42 +63,35 @@ %clean %{__rm} -rf %{buildroot} -# FIXME copied from the upstream spec verbatim, doesn't seem to work if Pegasus -# is not running at install time - -%pre -# Conditional definition of schema and registration files -%define SCHEMA %{_datadir}/%{name}/Linux_DHCPEntity.mof %{_datadir}/%{name}/Linux_DHCPService.mof %{_datadir}/%{name}/Linux_DHCPGlobal.mof %{_datadir}/%{name}/Linux_DHCPGlobalForService.mof %{_datadir}/%{name}/Linux_DHCPGroup.mof %{_datadir}/%{name}/Linux_DHCPGroupsForEntity.mof %{_datadir}/%{name}/Linux_DHCPHost.mof %{_datadir}/%{name}/Linux_DHCPHostsForEntity.mof %{_datadir}/%{name}/Linux_DHCPOptions.mof %{_datadir}/%{name}/Linux_DHCPOptionsForEntity.mof %{_datadir}/%{name}/Linux_DHCPParams.mof %{_datadir}/%{name}/Linux_DHCPParamsForEntity.mof %{_datadir}/%{name}/Linux_DHCPPool.mof %{_datadir}/%{name}/Linux_DHCPPoolsForEntity.mof %{_datadir}/%{name}/Linux_DHCPRegisteredProfile.mof %{_datadir}/%{name}/Linux_DHCPServiceConfiguration.mof %{_datadir}/%{name}/Linux_DHCPServiceConfigurationForService.mof %{_datadir}/%{name}/Linux_DHCPSharednet.mof %{_datadir}/%{name}/Linux_DHCPSharednetsForEntity.mof %{_datadir}/%{name}/Linux_DHCPSubnet.mof %{_datadir}/%{name}/Linux_DHCPSubnetsForEntity.mof %{_datadir}/%{name}/Linux_DHCPElementConformsToProfile.mof -%define REGISTRATION %{_datadir}/%{name}/Linux_DHCPGlobal.registration %{_datadir}/%{name}/Linux_DHCPGlobalForService.registration %{_datadir}/%{name}/Linux_DHCPGroup.registration %{_datadir}/%{name}/Linux_DHCPGroupsForEntity.registration %{_datadir}/%{name}/Linux_DHCPHost.registration %{_datadir}/%{name}/Linux_DHCPHostsForEntity.registration %{_datadir}/%{name}/Linux_DHCPOptions.registration %{_datadir}/%{name}/Linux_DHCPOptionsForEntity.registration %{_datadir}/%{name}/Linux_DHCPParams.registration %{_datadir}/%{name}/Linux_DHCPParamsForEntity.registration %{_datadir}/%{name}/Linux_DHCPPool.registration %{_datadir}/%{name}/Linux_DHCPPoolsForEntity.registration %{_datadir}/%{name}/Linux_DHCPRegisteredProfile.registration %{_datadir}/%{name}/Linux_DHCPService.registration %{_datadir}/%{name}/Linux_DHCPServiceConfiguration.registration %{_datadir}/%{name}/Linux_DHCPServiceConfigurationForService.registration %{_datadir}/%{name}/Linux_DHCPSharednet.registration %{_datadir}/%{name}/Linux_DHCPSharednetsForEntity.registration %{_datadir}/%{name}/Linux_DHCPSubnet.registration %{_datadir}/%{name}/Linux_DHCPSubnetsForEntity.registration -%define INTEROP_SCHEMAS %{_datadir}/%{name}/Linux_DHCPService.mof %{_datadir}/%{name}/Linux_DHCPRegisteredProfile.mof %{_datadir}/%{name}/Linux_DHCPElementConformsToProfile.mof -%define INTEROP_REGISTRATIONS %{_datadir}/%{name}/Linux_DHCPRegisteredProfile.registration %{_datadir}/%{name}/Linux_DHCPElementConformsToProfile.registration -# If upgrading, deregister old version -if [ $1 -gt 1 ] -then - /usr/sbin/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null || : - /usr/sbin/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ - -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null || : -fi -############################################################################### %post -# Register Schema and Provider - this is highly provider specific -/usr/sbin/provider-register.sh %{?tog_pegasus:-t pegasus} \ - -v -r %{REGISTRATION} -m %{SCHEMA} > /dev/null || : -/usr/sbin/provider-register.sh %{?tog_pegasus:-t pegasus} \ - -v -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null || : /sbin/ldconfig +%define mofs Linux_DHCPEntity Linux_DHCPService Linux_DHCPGlobal Linux_DHCPGlobalForService Linux_DHCPGroup Linux_DHCPGroupsForEntity Linux_DHCPHost Linux_DHCPHostsForEntity Linux_DHCPOptions Linux_DHCPOptionsForEntity Linux_DHCPParams Linux_DHCPParamsForEntity Linux_DHCPPool Linux_DHCPPoolsForEntity Linux_DHCPRegisteredProfile Linux_DHCPServiceConfiguration Linux_DHCPServiceConfigurationForService Linux_DHCPSharednet Linux_DHCPSharednetsForEntity Linux_DHCPSubnet Linux_DHCPSubnetsForEntity Linux_DHCPElementConformsToProfile +# compile MOF +d=%_datadir/%name +m="" +r="" +for i in %mofs; do + m="$m $d/$i.mof" + if test -f $d/$i.registration; then + r="$r $d/$i.registration" + fi +done +$d/provider-register.sh -t sfcb -r $r -m $m ############################################################################### %preun -# Deregister only if not upgrading -if [ $1 -eq 0 ] -then - /usr/sbin/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ - -r %{REGISTRATION} -m %{SCHEMA} > /dev/null || : - /usr/sbin/provider-register.sh -d %{?tog_pegasus:-t pegasus} \ - -n "root/PG_InterOp" -r %{INTEROP_REGISTRATIONS} -m %{INTEROP_SCHEMAS} > /dev/null || : +if [ $1 -eq 0 ]; then + d=%_datadir/%name + m="" + r="" + for i in %mofs; do + m="$m $d/$i.mof" + if test -f $d/$i.registration; then + r="$r $d/$i.registration" + fi + done + $d/provider-register.sh -t sfcb -d -r $r -m $m fi ############################################################################### @@ -116,6 +109,8 @@ %doc %{_docdir}/%{name} %changelog +* Fri Sep 12 2008 mmarek@suse.cz +- switch to sfcb * Mon Aug 18 2008 mmarek@suse.cz - create the tempfile in libuniquekey with mode 0600 (sf#2049850) * Wed Aug 13 2008 mmarek@suse.cz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org