commit sblim-cmpi-fsvol for openSUSE:Factory
Hello community, here is the log from the commit of package sblim-cmpi-fsvol for openSUSE:Factory checked in at Wed Jan 14 01:56:30 CET 2009. -------- --- sblim-cmpi-fsvol/sblim-cmpi-fsvol.changes 2008-08-25 22:43:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/sblim-cmpi-fsvol/sblim-cmpi-fsvol.changes 2009-01-13 19:43:07.000000000 +0100 @@ -1,0 +2,20 @@ +Tue Jan 13 11:42:06 MST 2009 - npaxton@novell.com + +- Add a check for provider-register.sh in case upgrading from an + old version of rpm that may have removed it without check for + upgrade/uninstall/etc + +------------------------------------------------------------------- +Fri Dec 12 21:27:47 CET 2008 - bwhiteley@suse.de + +- Added .la files back. Added back PreReq for loadmof.sh + and rmmof.sh. + +------------------------------------------------------------------- +Fri Dec 12 01:00:29 CET 2008 - bwhiteley@suse.de + +- Made use of provider-register.sh conditional on presence of sfcb, + and added back calls to loadmof.sh/rmmof.sh so the package works + for both sfcb and openwbem. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sblim-cmpi-fsvol.spec ++++++ --- /var/tmp/diff_new_pack.P20799/_old 2009-01-14 01:56:17.000000000 +0100 +++ /var/tmp/diff_new_pack.P20799/_new 2009-01-14 01:56:17.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package sblim-cmpi-fsvol (Version 1.4.4) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,12 @@ Name: sblim-cmpi-fsvol BuildRequires: gcc-c++ sblim-cmpi-base-devel sblim-cmpi-devel sblim-indication_helper-devel sblim-sfcb sblim-testsuite Version: 1.4.4 -Release: 80 +Release: 90 Group: System/Management License: IBM Public License BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: sblim-cmpi-base, cim-server +PreReq: /usr/bin/loadmof.sh, /usr/bin/rmmof.sh Url: http://sblim.wiki.sourceforge.net/ Source: http://prdownloads.sourceforge.net/sblim/%{name}-%{version}.tar.bz2 Summary: SBLIM File System & Volume Mgmt. Instrumentation for CMPI @@ -50,27 +51,34 @@ %install %makeinstall docdir=%{_docdir}/%{name} -rm %buildroot%_libdir/cmpi/*.la -rm %buildroot%_libdir/*.la +#rm %buildroot%_libdir/cmpi/*.la +#rm %buildroot%_libdir/*.la %clean %{__rm} -rf %{buildroot} %pre # If upgrading/not new install/not removing, deregister old version -if [ $1 -gt 1 ] -then - %{_datadir}/%{name}/provider-register.sh -d -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof +if [ $1 -gt 1 ]; then + if [ -x /usr/sbin/sfcbd -a -x %{_datadir}/%{name}/provider-register.sh ]; then + %{_datadir}/%{name}/provider-register.sh -t sfcb -d -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof + fi fi %post # compile MOF /sbin/ldconfig -%{_datadir}/%{name}/provider-register.sh -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof +if [ -x /usr/sbin/sfcbd ]; then + %{_datadir}/%{name}/provider-register.sh -t sfcb -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof +fi +/usr/bin/loadmof.sh -n root/cimv2 %{_datadir}/%{name}/Linux_Fsvol.mof ||: %preun if [ "$1" = "0" ]; then - %{_datadir}/%{name}/provider-register.sh -d -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof + if [ -x /usr/sbin/sfcbd -a -x %{_datadir}/%{name}/provider-register.sh ]; then + %{_datadir}/%{name}/provider-register.sh -t sfcb -d -r %{_datadir}/%{name}/*.registration -m %{_datadir}/%{name}/*.mof + fi + /usr/bin/rmmof.sh -n root/cimv2 %{_datadir}/%{name}/Linux_Fsvol.mof ||: fi %postun -p /sbin/ldconfig @@ -78,11 +86,13 @@ %files %defattr(-,root,root) %{_libdir}/cmpi/*.so +%{_libdir}/cmpi/*.la %{_libdir}/*.so +%{_libdir}/*.la %{_libdir}/*.so.* %doc %{_docdir}/%{name} -%dir %{_datadir}/sblim-cmpi-fsvol/ -%{_datadir}/sblim-cmpi-fsvol/ +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/ # split out to devel pkg? %{_includedir}/sblim/*.h # %files testsuite @@ -90,6 +100,17 @@ %{_datadir}/sblim-testsuite/* %changelog +* Tue Jan 13 2009 npaxton@novell.com +- Add a check for provider-register.sh in case upgrading from an + old version of rpm that may have removed it without check for + upgrade/uninstall/etc +* Fri Dec 12 2008 bwhiteley@suse.de +- Added .la files back. Added back PreReq for loadmof.sh + and rmmof.sh. +* Thu Dec 11 2008 bwhiteley@suse.de +- Made use of provider-register.sh conditional on presence of sfcb, + and added back calls to loadmof.sh/rmmof.sh so the package works + for both sfcb and openwbem. * Mon Aug 25 2008 npaxton@novell.com - Switch from provider-register.sh from sblim-cmpi-base to locally-provided provider-register.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de