rpms/libvirt-cim/devel .cvsignore, 1.5, 1.6 libvirt-cim.spec, 1.10, 1.11 sources, 1.6, 1.7

[Dan Smith (danms)]

Author: danms

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15562

Modified Files:
	.cvsignore libvirt-cim.spec sources 
Log Message:
Fix RegisteredProfile, interop schema install



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 Mar 2008 21:00:39 -0000	1.5
+++ .cvsignore	14 Mar 2008 19:08:05 -0000	1.6
@@ -1,2 +1,3 @@
 libvirt-cim-0.3.tar.gz
 kvm_method.patch
+registeredprofile.patch


Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libvirt-cim.spec	7 Mar 2008 21:00:39 -0000	1.10
+++ libvirt-cim.spec	14 Mar 2008 19:08:05 -0000	1.11
@@ -3,7 +3,7 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -19,6 +19,7 @@
 BuildConflicts: sblim-cmpi-devel
 Patch0: parse.patch
 Patch1: kvm_method.patch
+Patch2: registeredprofile.patch
 
 %description
 Libvirt-cim is a CMPI CIM provider that implements the DMTF SVPC
@@ -32,6 +33,7 @@
 chmod +X src/* libxkutil/* schema/*
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure --disable-werror
@@ -43,13 +45,14 @@
 rm -fr $RPM_BUILD_ROOT
 
 make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/libxkutil.so
 mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo /usr/lib/cmpi > $RPM_BUILD_ROOT/etc/ld.so.conf.d/libvirt-cim.conf
+echo %{_libdir}/cmpi > $RPM_BUILD_ROOT/etc/ld.so.conf.d/libvirt-cim.conf
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -58,6 +61,9 @@
 %define REGISTRATION %{_datadir}/%{name}/*.registration
 %define SCHEMA %{_datadir}/%{name}/*.mof
 
+%define INTEROP_REG %{_datadir}/%{name}/{RegisteredProfile,ElementConformsToProfile}.registration
+%define INTEROP_MOF %{_datadir}/%{name}/{ComputerSystem,HostSystem,RegisteredProfile,ElementConformsToProfile}.mof
+
 # _If_ there is already a version of this installed, we must deregister
 # the classes we plan to install in post, otherwise we may corrupt
 # the pegasus repository.  This is convention in other provider packages
@@ -75,6 +81,9 @@
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -t pegasus \
+	-n root/interop \
+	-r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
 
 %preun
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
@@ -101,6 +110,10 @@
 /etc/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Fri Mar 14 2008 Dan Smith <danms at us.ibm.com> - 0.3-3
+- Fixed loader config for 64-bit systems
+- Added missing root/interop schema install
+
 * Fri Mar 07 2008 Dan Smith <danms at us.ibm.com> - 0.3-2
 - Added KVM method enablement patch
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	7 Mar 2008 21:00:39 -0000	1.6
+++ sources	14 Mar 2008 19:08:05 -0000	1.7
@@ -1,2 +1,3 @@
 528908c9daf98c077f90b7df6fdf1c0a  libvirt-cim-0.3.tar.gz
 36bbef64cba0015daf6eb34d054a2751  kvm_method.patch
+b5f5d906d66309238da342745095f0bb  registeredprofile.patch