[sblim-cmpi-nfsv4] Update to sblim-cmpi-nfsv4-1.1.0, Remove CIMOM dependencies
vcrhonek
vcrhonek at fedoraproject.org
Wed Oct 6 14:25:40 UTC 2010
commit df3795525f5e2663a96cfb93629def588b2092fb
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date: Wed Oct 6 16:25:44 2010 +0200
Update to sblim-cmpi-nfsv4-1.1.0, Remove CIMOM dependencies
.gitignore | 1 +
sblim-cmpi-nfsv4.spec | 54 +++++++++++++++++++++++++++---------------------
sources | 2 +-
3 files changed, 32 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 054b5e9..d822706 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
sblim-cmpi-nfsv4-1.0.12.tar.bz2
+/sblim-cmpi-nfsv4-1.1.0.tar.bz2
diff --git a/sblim-cmpi-nfsv4.spec b/sblim-cmpi-nfsv4.spec
index 763deea..7111f3f 100644
--- a/sblim-cmpi-nfsv4.spec
+++ b/sblim-cmpi-nfsv4.spec
@@ -1,20 +1,17 @@
%define provider_dir %{_libdir}/cmpi
-%define tog_pegasus_version 2:2.5.1
Name: sblim-cmpi-nfsv4
Summary: SBLIM nfsv4 instrumentation
-Version: 1.0.12
+Version: 1.1.0
Release: 1%{?dist}
-License: CPL
+License: EPL
Group: Applications/System
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://sourceforge.net/projects/sblim/
Source0: http://downloads.sourceforge.net/project/sblim/%{name}/%{version}/%{name}-%{version}.tar.bz2
-BuildRequires: tog-pegasus-devel >= %{tog_pegasus_version}
-BuildRequires: sblim-cmpi-base-devel
-Requires: tog-pegasus >= %{tog_pegasus_version}
-Requires: sblim-cmpi-base
+BuildRequires: sblim-cmpi-base-devel sblim-cmpi-devel
+Requires: sblim-cmpi-base cim-server cim-schema
Requires: /etc/ld.so.conf.d
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@@ -27,7 +24,6 @@ Standards Based Linux Instrumentation Nfsv4 Providers
Summary: SBLIM Nfsv4 Instrumentation Header Development Files
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: tog-pegasus
%description devel
SBLIM Base Nfsv4 Development Package
@@ -37,7 +33,6 @@ Summary: SBLIM Nfsv4 Instrumentation Testcases
Group: Applications/System
Requires: %{name} = %{version}-%{release}
Requires: sblim-testsuite
-Requires: tog-pegasus
%description test
SBLIM Base Fsvol Testcase Files for SBLIM Testsuite
@@ -52,8 +47,8 @@ export CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
export CFLAGS="$RPM_OPT_FLAGS"
%endif
%configure \
+ --disable-static \
TESTSUITEDIR=%{_datadir}/sblim-testsuite \
- CIMSERVER=pegasus \
PROVIDERDIR=%{provider_dir}
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -63,52 +58,59 @@ make
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
# remove unused libtool files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*a
-rm -f $RPM_BUILD_ROOT/%{provider_dir}/*a
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT/%{provider_dir}/*.la
# shared libraries
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d
echo "%{_libdir}/cmpi" > $RPM_BUILD_ROOT/%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
mv $RPM_BUILD_ROOT/%{_libdir}/libLinux_NFSv4SystemConfigurationUtil.so $RPM_BUILD_ROOT/%{provider_dir}
%files
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
%dir %{provider_dir}
-%{provider_dir}/libLinux_NFSv4*
+%{provider_dir}/*.so
%{_datadir}/%{name}
%docdir %{_datadir}/doc/%{name}-%{version}
%{_datadir}/doc/%{name}-%{version}
%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
%files test
-%defattr(-,root,root,0755)
-%{_datadir}/sblim-testsuite/sblim-cmpi-nfsv4-test.sh
-%{_datadir}/sblim-testsuite/exports.nfsv4
-%{_datadir}/sblim-testsuite/cim/Linux_NFSv4*
-%{_datadir}/sblim-testsuite/system/linux/Linux_NFSv4*
+%defattr(-,root,root,-)
+%{_datadir}/sblim-testsuite
-%define NFSV4_SCHEMA %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemSetting.mof %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemConfiguration.mof
-%define NFSV4_REGISTRATION %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemConfiguration.registration %{_datadir}/sblim-cmpi-nfsv4/Linux_NFSv4SystemSetting.registration
+%define PEGASUS_MOF CIM_SystemSetting,CIM_NFS,CIM_SystemConfiguration,CIM_SystemSettingContext
%pre
# If upgrading, deregister old version
if [ $1 -gt 1 ]; then
%{_datadir}/%{name}/provider-register.sh -d \
- -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
+ -r %{_datadir}/%{name}/*.registration \
+ -m %{_datadir}/%{name}/*.mof \
+ > /dev/null 2>&1 || :;
fi
%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 \
- -t pegasus -r %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
+ -r %{_datadir}/%{name}/*.registration \
+ -m %{_datadir}/%{name}/*.mof \
+ > /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 %{NFSV4_REGISTRATION} -m %{NFSV4_SCHEMA} > /dev/null 2>&1 || :;
+ -r %{_datadir}/%{name}/*.registration \
+ -m %{_datadir}/%{name}/*.mof \
+ > /dev/null 2>&1 || :;
fi
%postun -p /sbin/ldconfig
@@ -117,5 +119,9 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Oct 6 2010 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.1.0-1
+- Update to sblim-cmpi-nfsv4-1.1.0
+- Remove CIMOM dependencies
+
* Wed Oct 14 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.0.12-1
- Initial support
diff --git a/sources b/sources
index f4ab5f6..4c8f16c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6f4370a39f3d777d554183fb09e93ddc sblim-cmpi-nfsv4-1.0.12.tar.bz2
+293b12060de9dc0470e645d14054d5a5 sblim-cmpi-nfsv4-1.1.0.tar.bz2
More information about the scm-commits
mailing list