[packages/libvirt] up to 5.2.0 (upstream dropped sysv init scripts support)
atler
atler at pld-linux.org
Wed Apr 3 22:46:56 CEST 2019
commit 549ba196e45098f7e812c201feb76b3d283988af
Author: Jan Palus <atler at pld-linux.org>
Date: Wed Apr 3 22:33:11 2019 +0200
up to 5.2.0 (upstream dropped sysv init scripts support)
- rel 0.1 to wait for anyone who still needs sysv init scripts and wants
to maintain them
- updated TODO
libvirt-guests.init.patch | 9 ---------
libvirt-sasl.patch | 16 ++++++++--------
libvirt.spec | 17 ++++++-----------
virtlockd.init.patch | 8 --------
4 files changed, 14 insertions(+), 36 deletions(-)
---
diff --git a/libvirt.spec b/libvirt.spec
index 3db4263..1d4dc33 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -3,6 +3,7 @@
# - virtuozzo storage?
# - pldize virtlockd.init
# - update vserver patch, if anybody needs it
+# - package firewalld zone definition
#
# Conditional build:
# - virtualization
@@ -43,21 +44,19 @@
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji
Name: libvirt
-Version: 5.1.0
-Release: 2
+Version: 5.2.0
+Release: 0.1
License: LGPL v2.1+
Group: Libraries
Source0: http://libvirt.org/sources/libvirt-%{version}.tar.xz
-# Source0-md5: 74c6c2e90ca9c94d9255eec338615a0c
+# Source0-md5: 1e54f5b829482d977bc5353c861407d3
Source1: %{name}.init
Source2: %{name}.tmpfiles
Patch0: %{name}-sasl.patch
Patch2: %{name}-qemu-acl.patch
-Patch3: virtlockd.init.patch
Patch4: %{name}-udevadm-settle.patch
Patch5: vserver.patch
Patch6: bashisms.patch
-Patch7: %{name}-guests.init.patch
URL: http://www.libvirt.org/
BuildRequires: acl-devel
BuildRequires: attr-devel
@@ -440,11 +439,9 @@ Moduł sekcji Wiresharka do pakietów libvirt.
%setup -q
%patch0 -p1
%patch2 -p1
-%patch3 -p1
%patch4 -p1
%{?with_vserver:%patch5 -p1}
%patch6 -p1
-%patch7 -p1
%build
%{__libtoolize}
@@ -494,7 +491,7 @@ Moduł sekcji Wiresharka do pakietów libvirt.
--with-bash-completions-dir=/etc/bash_completion.d \
--with-html-dir=%{_gtkdocdir} \
--with-html-subdir=%{name} \
- --with-init-script=systemd+redhat \
+ --with-init-script=systemd \
--with-packager="PLD-Linux" \
--with-packager-version="%{name}-%{version}-%{release}.%{_target_cpu}" \
--with-qemu-user=qemu \
@@ -696,8 +693,6 @@ fi
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlockd
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/virtlogd
%attr(754,root,root) /etc/rc.d/init.d/libvirtd
-%attr(754,root,root) /etc/rc.d/init.d/virtlockd
-%attr(754,root,root) /etc/rc.d/init.d/virtlogd
%{systemdunitdir}/libvirtd.service
%{systemdunitdir}/virt-guest-shutdown.target
%{systemdunitdir}/virtlockd.service
@@ -827,7 +822,6 @@ fi
%files client
%defattr(644,root,root,755)
%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/libvirt-guests
-%attr(754,root,root) /etc/rc.d/init.d/libvirt-guests
%{systemdunitdir}/libvirt-guests.service
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/libvirt/virt-login-shell.conf
%attr(755,root,root) %{_bindir}/virsh
@@ -861,6 +855,7 @@ fi
%{_datadir}/libvirt/schemas/secret.rng
%{_datadir}/libvirt/schemas/storagecommon.rng
%{_datadir}/libvirt/schemas/storagepool.rng
+%{_datadir}/libvirt/schemas/storagepoolcaps.rng
%{_datadir}/libvirt/schemas/storagevol.rng
# for test driver (built into libvirt)
%{_datadir}/libvirt/test-screenshot.png
diff --git a/libvirt-guests.init.patch b/libvirt-guests.init.patch
deleted file mode 100644
index da84255..0000000
--- a/libvirt-guests.init.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- libvirt-1.2.3/./tools/libvirt-guests.init.in~ 2012-12-12 04:29:55.000000000 +0200
-+++ libvirt-1.2.3/./tools/libvirt-guests.init.in 2014-04-06 12:13:29.091387594 +0300
-@@ -25,3 +25,6 @@
- #
-
- exec @libexecdir@/libvirt-guests.sh "$@"
-+
-+# next line is here for "service --status-all" to work
-+# status)
diff --git a/libvirt-sasl.patch b/libvirt-sasl.patch
index 60aa717..0f1b8af 100644
--- a/libvirt-sasl.patch
+++ b/libvirt-sasl.patch
@@ -82,25 +82,25 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/qemuxml2argvda
--- libvirt-2.5.0.orig/tests/qemuxml2argvdata/-graphics-vnc-sasl.args 2016-07-27 14:39:35.000000000 +0200
+++ libvirt-2.5.0/tests/qemuxml2argvdata/graphics-vnc-sasl.args 2016-12-20 12:56:04.000000000 +0100
@@ -3,7 +3,7 @@
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
QEMU_AUDIO_DRV=none \
- /usr/bin/qemu \
+ /usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args libvirt-2.5.0/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args
--- libvirt-2.5.0.orig/tests/qemuxml2argvdata/graphics-vnc-tls.args 2016-07-27 14:39:35.000000000 +0200
+++ libvirt-2.5.0/tests/qemuxml2argvdata/graphics-vnc-tls.args 2016-12-20 12:56:04.000000000 +0100
@@ -3,7 +3,7 @@
- HOME=/home/test \
- USER=test \
- LOGNAME=test \
+ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
+ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
+ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
+SASL_CONF_PATH=/root/.sasl \
QEMU_AUDIO_DRV=none \
- /usr/bin/qemu \
+ /usr/bin/qemu-system-i686 \
-name QEMUGuest1 \
diff -dur -x '*~' -x '*.orig' -x '*.rej' libvirt-2.5.0.orig/tests/virconfdata/libvirtd.conf libvirt-2.5.0/tests/virconfdata/libvirtd.conf
--- libvirt-2.5.0.orig/tests/virconfdata/libvirtd.conf 2016-04-26 04:20:09.000000000 +0200
diff --git a/virtlockd.init.patch b/virtlockd.init.patch
deleted file mode 100644
index f3bdadd..0000000
--- a/virtlockd.init.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- libvirt-1.0.4/src/locking/virtlockd.init.in~ 2013-01-17 08:01:39.000000000 +0200
-+++ libvirt-1.0.4/src/locking/virtlockd.init.in 2013-04-26 22:51:35.454895048 +0300
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- # the following is the LSB init header see
- # http://www.linux-foundation.org/spec//booksets/LSB-Core-generic/LSB-Core-generic.html#INITSCRCOMCONV
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libvirt.git/commitdiff/549ba196e45098f7e812c201feb76b3d283988af
More information about the pld-cvs-commit
mailing list