rpms/libvirt-cim/devel libvirt-cim.spec,1.30,1.31

[Kaitlin Rupert]

Author: kaitlin

Update of /cvs/pkgs/rpms/libvirt-cim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5953

Modified Files:
	libvirt-cim.spec 
Log Message:
Make some changes based on issues Daniel Veillard pointed out.

- Add missing namespace unreg bits for root/interop, root/cimv2
- Remove additional reg call of root/virt from postinstall
- Do not use /etc directly.  Use sysconfigdir instead
- Remove additional DESTDIR definition




Index: libvirt-cim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libvirt-cim/devel/libvirt-cim.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- libvirt-cim.spec	2 Dec 2009 23:34:04 -0000	1.30
+++ libvirt-cim.spec	7 Dec 2009 17:48:32 -0000	1.31
@@ -3,7 +3,7 @@
 Summary: A CIM provider for libvirt
 Name: libvirt-cim
 Version: 0.5.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Libraries
 Source: libvirt-cim-%{version}.tar.gz
@@ -40,7 +40,6 @@ make %{?_smp_mflags}
 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
@@ -84,8 +83,8 @@ rm -fr $RPM_BUILD_ROOT
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -t pegasus \
-        -n root/virt \
-        -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
+	-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
@@ -101,29 +100,42 @@ rm -fr $RPM_BUILD_ROOT
 	-n root/virt \
 	-r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true
 %{_datadir}/%{name}/provider-register.sh -d -t pegasus \
+        -n root/interop \
+        -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -d -t pegasus \
         -n root/PG_InterOp \
         -r %{PGINTEROP_REG} -m %{PGINTEROP_MOF} >/dev/null 2>&1 || true
+%{_datadir}/%{name}/provider-register.sh -d -t pegasus \
+        -n root/cimv2 \
+        -r %{CIMV2_REG} -m %{CIMV2_MOF} -v >/dev/null 2>&1 || true
 
 %postun -p /sbin/ldconfig
 
 %files 
 %defattr(-, root, root)
-/etc/libvirt/cim
+%{_sysconfdir}/libvirt/cim
 
 %doc README COPYING doc/CodingStyle doc/SubmittingPatches
 %doc base_schema/README.DMTF
 %doc doc/*.html
 %{_libdir}/lib*.so*
 %{_libdir}/cmpi/lib*.so*
+%{_datadir}/libvirt-cim
 %{_datadir}/libvirt-cim/*.sh
 %{_datadir}/libvirt-cim/*.mof
 %{_datadir}/libvirt-cim/cimv*-interop_mof
 %{_datadir}/libvirt-cim/cimv*-cimv2_mof
 %{_datadir}/libvirt-cim/*.registration
 %{_datadir}/libvirt-cim/cim_schema_*-MOFs.zip
-/etc/ld.so.conf.d/libvirt-cim.conf
+%{_sysconfdir}/ld.so.conf.d/libvirt-cim.conf
 
 %changelog
+* Mon Dec 07 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.8-2
+- Add missing namespace unreg bits for root/interop, root/cimv2 
+- Remove additional reg call of root/virt from postinstall 
+- Do not use /etc directly.  Use sysconfigdir instead
+- Remove additional DESTDIR definition
+
 * Wed Dec 02 2009 Kaitlin Rupert <kaitlin at us.ibm.com> - 0.5.8-1
 - Updated to latest upstream source