# HG changeset patch # User Dan Smith <danms@us.ibm.com> # Date 1197481264 28800 # Node ID c37e79945f4f7272be9f4ffa2d464aed09e3b445 # Parent 85e3ec9836b74c4d3424fc4e67d7c6a22c00863d RPM spec updates - Restart the CIMOM after base schema installation - Installed file cleanups - Permissions cleanups - Require correct version of libvirt - Require unzip, since we need it for base schema unpacking - Require explicit verison of libxml2 (for rpmlint). I have no idea what version is actually required, so I took the F8 version. If someone has an opinion or complaint about this, I'm happy to change it. Signed-off-by: Dan Smith <danms@us.ibm.com> diff -r 85e3ec9836b7 -r c37e79945f4f libvirt-cim.spec.in --- a/libvirt-cim.spec.in Wed Dec 12 08:40:39 2007 -0800 +++ b/libvirt-cim.spec.in Wed Dec 12 09:41:04 2007 -0800 @@ -9,10 +9,11 @@ Source: libvirt-cim-%{version}.tar.gz Source: libvirt-cim-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/CIM/ -Requires: libxml2 -Requires: libvirt >= 0.2.3 +Requires: libxml2 >= 2.6.0 +Requires: libvirt >= 0.3.2 +Requires: unzip BuildRequires: tog-pegasus-devel -BuildRequires: libvirt-devel >= 0.2.3 +BuildRequires: libvirt-devel >= 0.3.2 BuildRequires: e2fsprogs-devel BuildRequires: libxml2-devel BuildRequires: libcmpiutil-devel @@ -26,7 +27,8 @@ platforms with a single provider. %prep %setup -q -chmod -x src/* libxkutil/* schema/* +chmod -x src/* libxkutil/* schema/* README doc/* base_schema/README* +chmod +X src/* libxkutil/* schema/* %build %configure --disable-werror @@ -40,6 +42,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.a 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 %clean rm -fr $RPM_BUILD_ROOT @@ -57,22 +60,24 @@ rm -fr $RPM_BUILD_ROOT %{_datadir}/%{name}/install_base_schema.sh %{_datadir}/%{name} +/etc/init.d/tog-pegasus restart + %{_datadir}/%{name}/provider-register.sh -t pegasus \ -n /@CIM_VIRT_NS@ \ - -r %{REGISTRATION} -m %{SCHEMA} || true + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true %preun %{_datadir}/%{name}/provider-register.sh -d -t pegasus \ -n /@CIM_VIRT_NS@ \ - -r %{REGISTRATION} -m %{SCHEMA} || true + -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true %postun -p /sbin/ldconfig %files %defattr(-, root, root) -%doc README doc/CodingStyle doc/SubmittingPatches -%doc provider-register.sh +%doc README COPYING doc/CodingStyle doc/SubmittingPatches +%doc base_schema/README.DMTF %doc doc/*.html %{_libdir}/lib*.so* %{_libdir}/cmpi/lib*.so*