rpm/libvirt
SHA256
1
0
Fork 0
forked from pool/libvirt
Code Pull Requests Activity

Accepting request 439197 from home:cbosdonnat:branches:Virtualization

Browse Source 
- Package org.libvirt.api.policy polkit file (bsc#959297)
- Fix postun systemd services cleanup
- Mark /etc/libvirt/nwfilter/*.xml files as config files

OBS-URL: https://build.opensuse.org/request/show/439197
OBS-URL: https://build.opensuse.org/package/show/Virtualization/libvirt?expand=0&rev=570
This commit is contained in:
Cédric Bosdonnat 2016-11-08 14:03:56 +00:00 committed by Git OBS Bridge
parent f2577f99c5
commit f9b2460e54
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvirt-rpmlintrc
View File

@ -1 +1,3 @@
addFilter("shlib-policy-name-error") addFilter("shlib-policy-name-error")
addFilter("missing-dependency-to-logrotate for logrotate script /etc/logrotate.d/libvirtd.(qemu|lxc|uml|libxl)")
addFilter("incoherent-logrotate-file")

7
libvirt.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Nov 8 10:18:44 UTC 2016 - cbosdonnat@suse.com
- Package org.libvirt.api.policy polkit file (bsc#959297)
- Fix postun systemd services cleanup
- Mark /etc/libvirt/nwfilter/*.xml files as config files
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Nov 2 16:44:57 UTC 2016 - jfehlig@suse.com Wed Nov 2 16:44:57 UTC 2016 - jfehlig@suse.com

15
libvirt.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package libvirt # spec file for package libvirt
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -1008,8 +1008,6 @@ do
if test -d $sdir ; then continue ; fi if test -d $sdir ; then continue ; fi
rm -rfv "$dir" rm -rfv "$dir"
done done
# temporarily remove polkit ACL policiy configuration - bnc#827644
rm -f $RPM_BUILD_ROOT/%{_datadir}/polkit-1/actions/org.libvirt.api.policy
mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/lib/libvirt
mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/hooks mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/libvirt/hooks
@ -1201,7 +1199,13 @@ fi
%restart_on_update virtlockd %restart_on_update virtlockd
%restart_on_update virtlogd %restart_on_update virtlogd
%endif %endif
%insserv_cleanup %if %{with_systemd}
%service_del_postun libvirtd.service
%service_del_postun virtlockd.service virtlockd.socket
%service_del_postun virtlogd.service virtlogd.socket
%else
%insserv_cleanup
%endif
%posttrans daemon %posttrans daemon
# All connection drivers should be installed post transaction. # All connection drivers should be installed post transaction.
@ -1338,6 +1342,7 @@ fi
%{_datadir}/polkit-1/rules.d/50-libvirt.rules %{_datadir}/polkit-1/rules.d/50-libvirt.rules
%endif %endif
%{_datadir}/polkit-1/actions/org.libvirt.unix.policy %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
%{_datadir}/polkit-1/actions/org.libvirt.api.policy
%attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper %attr(0755, root, root) %{_libdir}/%{name}/libvirt_iohelper
%doc %{_mandir}/man8/libvirtd.8* %doc %{_mandir}/man8/libvirtd.8*
%doc %{_mandir}/man8/virtlogd.8* %doc %{_mandir}/man8/virtlogd.8*
@ -1362,7 +1367,7 @@ fi
%files daemon-config-nwfilter %files daemon-config-nwfilter
%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
%{_sysconfdir}/libvirt/nwfilter/*.xml %config %{_sysconfdir}/libvirt/nwfilter/*.xml
%files daemon-driver-interface %files daemon-driver-interface
%dir %{_libdir}/%{name}/connection-driver %dir %{_libdir}/%{name}/connection-driver