Hello community, here is the log from the commit of package libvirt-cim for openSUSE:Factory checked in at 2018-01-26 13:40:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt-cim (Old) and /work/SRC/openSUSE:Factory/.libvirt-cim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt-cim" Fri Jan 26 13:40:32 2018 rev:47 rq:569813 version:0.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt-cim/libvirt-cim.changes 2018-01-10 23:35:31.942997555 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt-cim.new/libvirt-cim.changes 2018-01-26 13:40:38.842078300 +0100 @@ -1,0 +2,13 @@ +Fri Jan 26 06:57:52 UTC 2018 - [email protected] + +- use correct service name when restarting sblim-sfcb +- fix builds on RedHat + +------------------------------------------------------------------- +Mon Jan 22 14:45:07 UTC 2018 - [email protected] + +- don't unregister providers on upgrade (bnc#1076418) +- don't register root/virt namespace in %post twice +- simplify %pre + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-cim.spec ++++++ --- /var/tmp/diff_new_pack.3bGF06/_old 2018-01-26 13:40:41.761941934 +0100 +++ /var/tmp/diff_new_pack.3bGF06/_new 2018-01-26 13:40:41.765941747 +0100 @@ -43,9 +43,7 @@ BuildRequires: e2fsprogs-devel BuildRequires: libcmpiutil-devel > 0.5.4 BuildRequires: libtool -%if 0%{?rhel_version} == 0 && 0%{?sles_version} != 10 BuildRequires: libuuid-devel -%endif BuildRequires: libvirt-devel >= 0.3.2 BuildRequires: libxml2-devel BuildRequires: sblim-cmpi-devel @@ -104,8 +102,10 @@ %install %if 0%{?suse_version} %make_install DOCS_DIR=%{_docdir}/%{name} HTML_DIR=%{_docdir}/%{name} +install -m 644 %{S:2} $RPM_BUILD_ROOT%{_docdir}/%{name} %else make install DESTDIR=$RPM_BUILD_ROOT DOCS_DIR=%{_docdir}/%{name}-%{version} HTML_DIR=%{_docdir}/%{name}-%{version} +install -m 644 %{S:2} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %endif %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la} %{__rm} -f $RPM_BUILD_ROOT%{_libdir}/cmpi/*.{a,la} @@ -117,14 +117,13 @@ #%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/fix_schema.patch mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/cim -install -m 644 %{S:2} $RPM_BUILD_ROOT%{_docdir}/%{name} - %pre -# do nothing if not an upgrade, otherwise deregister current providers -[ $1 -eq 1 ] && exit 0 +# unregister current providers on upgrade only +if [ $1 -eq 2 ]; then %{_datadir}/%{name}/provider-register.sh -d -t sfcb \ -n root/virt \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +fi %post /sbin/ldconfig @@ -133,9 +132,7 @@ %{_datadir}/%{name}/provider-register.sh -t sfcb \ -n root/virt \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true -%{_datadir}/%{name}/provider-register.sh -t sfcb \ - -n root/virt \ - -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +# Register some of our providers under other namespaces too? ok. %{_datadir}/%{name}/provider-register.sh -t sfcb \ -n root/interop \ -r %{INTEROP_REG} -m %{INTEROP_MOF} -v >/dev/null 2>&1 || true @@ -145,23 +142,26 @@ # Restart the sfcb to update its providers list if test -x /usr/sbin/sfcbd ; then %if 0%{?has_systemd} - systemctl try-restart sfcbd.service >/dev/null 2>&1 || : + systemctl try-restart sblim-sfcb.service >/dev/null 2>&1 || : %else /etc/init.d/sfcb restart %endif fi %preun +# unregister our providers only on uninstall +if [ $1 -eq 0 ]; then %{_datadir}/%{name}/provider-register.sh -d -t sfcb \ -n root/virt \ -r %{REGISTRATION} -m %{SCHEMA} >/dev/null 2>&1 || true +fi %postun /sbin/ldconfig # Restart the sfcb to update its providers list if test -x /usr/sbin/sfcbd ; then %if 0%{?has_systemd} - systemctl try-restart sfcbd.service >/dev/null 2>&1 || : + systemctl try-restart sblim-sfcb.service >/dev/null 2>&1 || : %else /etc/init.d/sfcb restart %endif
