rpms/libvirt
5
0
Fork 1
Code Issues Pull Requests Releases Activity

Update to 3.3.0 release

Browse Source 
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-05-08 10:45:19 +01:00
parent 20f9ed9c4c
commit b23ff9c0f7
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libvirt.spec
View File

@ -226,7 +226,7 @@
Summary: Library providing a simple virtualization API Summary: Library providing a simple virtualization API
Name: libvirt Name: libvirt
Version: 3.2.0 Version: 3.3.0
Release: 1%{?dist}%{?extra_release} Release: 1%{?dist}%{?extra_release}
License: LGPLv2+ License: LGPLv2+
Group: Development/Libraries Group: Development/Libraries
@ -421,9 +421,6 @@ BuildRequires: numad
%if %{with_wireshark} %if %{with_wireshark}
%if 0%{fedora} >= 24 %if 0%{fedora} >= 24
BuildRequires: wireshark-devel >= 2.1.0 BuildRequires: wireshark-devel >= 2.1.0
# Temp hack for F25/rawhide due to broken wireshark-devel deps
# https://bugzilla.redhat.com/show_bug.cgi?id=1401463
BuildRequires: qt-devel glib2-devel
%else %else
BuildRequires: wireshark-devel >= 1.12.1 BuildRequires: wireshark-devel >= 1.12.1
%endif %endif
@ -1363,6 +1360,13 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
$RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %post
# to avoid verification errors on changed files in /etc
install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/
cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \
$RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/
# Strip auto-generated UUID - we need it generated per-install # Strip auto-generated UUID - we need it generated per-install
sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
%if ! %{with_qemu} %if ! %{with_qemu}
@ -1589,6 +1593,17 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
fi fi
%post daemon-config-nwfilter
cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/
# Make sure libvirt picks up the new nwfilter defininitons
%if %{with_systemd}
/bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 ||:
%else
/sbin/service libvirtd condrestart > /dev/null 2>&1 || :
%endif
%if %{with_systemd} %if %{with_systemd}
%triggerun -- libvirt < 0.9.4 %triggerun -- libvirt < 0.9.4
%{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: %{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||:
@ -1762,6 +1777,7 @@ exit 0
%{_mandir}/man8/libvirtd.8* %{_mandir}/man8/libvirtd.8*
%{_mandir}/man8/virtlogd.8* %{_mandir}/man8/virtlogd.8*
%{_mandir}/man8/virtlockd.8* %{_mandir}/man8/virtlockd.8*
%{_mandir}/man7/virkey*.7*
%doc examples/polkit/*.rules %doc examples/polkit/*.rules
@ -1770,7 +1786,9 @@ exit 0
%{_datadir}/libvirt/networks/default.xml %{_datadir}/libvirt/networks/default.xml
%files daemon-config-nwfilter %files daemon-config-nwfilter
%{_sysconfdir}/libvirt/nwfilter/*.xml %dir %{_datadir}/libvirt/nwfilter/
%{_datadir}/libvirt/nwfilter/*.xml
%ghost %{_sysconfdir}/libvirt/nwfilter/*.xml
%files daemon-driver-interface %files daemon-driver-interface
%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
@ -2052,6 +2070,9 @@ exit 0
%changelog %changelog
* Mon May 8 2017 Daniel P. Berrange <berrange@redhat.com> - 3.3.0-1
- Rebase to version 3.3.0
* Mon Apr 3 2017 Daniel P. Berrange <berrange@redhat.com> - 3.2.0-1 * Mon Apr 3 2017 Daniel P. Berrange <berrange@redhat.com> - 3.2.0-1
- Rebase to version 3.2.0 - Rebase to version 3.2.0

2
sources
View File

@ -1 +1 @@
SHA512 (libvirt-3.2.0.tar.xz) = 35a9db3d59a3817d15fd6a586a2a73860b3d8a2d2ff37dbea1b4045fe1514c3535fce2eeba0f09df2d0bb9072ed9f1078ca9bad61a37c586eb019ddad3f898c4 SHA512 (libvirt-3.3.0.tar.xz) = 69166ddd7d4b9ef3b1bf2466e781139ef9b4d224a64acc7b8e6fca8786d36482138a1fe7b7407c0fca3b3d012cb418d168671a3e65e428f023c16493b7718c2d