From 727e799ab80c32bf4d3c21c5781db564600534bf8bc70cbffe7062370ce7d4ea Mon Sep 17 00:00:00 2001
From: Bruce Rogers <brogers@suse.com>
Date: Wed, 11 Apr 2018 19:20:00 +0000
Subject: [PATCH] Accepting request 595767 from
 home:bfrogers:branches:Virtualization

- fix qemu-ga service file name (bsc#1089067)

OBS-URL: https://build.opensuse.org/request/show/595767
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=405
---
 qemu-testsuite.changes |  5 +++++
 qemu-testsuite.spec    | 14 +++++++-------
 qemu.changes           |  5 +++++
 qemu.spec              | 14 +++++++-------
 qemu.spec.in           | 14 +++++++-------
 5 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index 63da132..4c35f5f 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 10 10:50:31 UTC 2018 - kwalter@suse.com
+
+- fix qemu-ga service file name (bsc#1089067)
+
 -------------------------------------------------------------------
 Thu Apr  5 21:33:37 UTC 2018 - brogers@suse.com
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index f8a5d2d..a8b2544 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -1288,7 +1288,7 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
 %endif
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
 %endif
-install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/qemu-ga.service
+install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/qemu-ga@.service
 %if 0%{?is_opensuse}
 install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
 %endif
@@ -1342,19 +1342,19 @@ fi
 
 %pre guest-agent
 %{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm
-%service_add_pre qemu-ga.service
+%service_add_pre qemu-ga@.service
 
 %preun guest-agent
-%service_del_preun qemu-ga.service
+%service_del_preun qemu-ga@.service
 
 %post guest-agent
-%service_add_post qemu-ga.service
+%service_add_post qemu-ga@.service
 if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then
-  /usr/bin/systemctl start qemu-ga.service || :
+  /usr/bin/systemctl start qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service || :
 fi
 
 %postun guest-agent
-%service_del_postun qemu-ga.service
+%service_del_postun qemu-ga@.service
 
 %if 0%{?is_opensuse}
 %pre ksm
@@ -1603,7 +1603,7 @@ fi
 %defattr(-, root, root)
 %_mandir/man8/qemu-ga.8.gz
 %attr(0755,root,kvm) %_bindir/qemu-ga
-%{_unitdir}/qemu-ga.service
+%{_unitdir}/qemu-ga@.service
 %{_udevrulesdir}/80-qemu-ga.rules
 
 %if 0%{?is_opensuse}
diff --git a/qemu.changes b/qemu.changes
index 63da132..4c35f5f 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 10 10:50:31 UTC 2018 - kwalter@suse.com
+
+- fix qemu-ga service file name (bsc#1089067)
+
 -------------------------------------------------------------------
 Thu Apr  5 21:33:37 UTC 2018 - brogers@suse.com
 
diff --git a/qemu.spec b/qemu.spec
index b29d097..b45081b 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1288,7 +1288,7 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
 %endif
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
 %endif
-install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/qemu-ga.service
+install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/qemu-ga@.service
 %if 0%{?is_opensuse}
 install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
 %endif
@@ -1342,19 +1342,19 @@ fi
 
 %pre guest-agent
 %{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm
-%service_add_pre qemu-ga.service
+%service_add_pre qemu-ga@.service
 
 %preun guest-agent
-%service_del_preun qemu-ga.service
+%service_del_preun qemu-ga@.service
 
 %post guest-agent
-%service_add_post qemu-ga.service
+%service_add_post qemu-ga@.service
 if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then
-  /usr/bin/systemctl start qemu-ga.service || :
+  /usr/bin/systemctl start qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service || :
 fi
 
 %postun guest-agent
-%service_del_postun qemu-ga.service
+%service_del_postun qemu-ga@.service
 
 %if 0%{?is_opensuse}
 %pre ksm
@@ -1603,7 +1603,7 @@ fi
 %defattr(-, root, root)
 %_mandir/man8/qemu-ga.8.gz
 %attr(0755,root,kvm) %_bindir/qemu-ga
-%{_unitdir}/qemu-ga.service
+%{_unitdir}/qemu-ga@.service
 %{_udevrulesdir}/80-qemu-ga.rules
 
 %if 0%{?is_opensuse}
diff --git a/qemu.spec.in b/qemu.spec.in
index 065e4f4..7ee3a71 100644
--- a/qemu.spec.in
+++ b/qemu.spec.in
@@ -1131,7 +1131,7 @@ install -D -m 0644 %{SOURCE4} %{buildroot}%{_mandir}/man1/kvm_stat.1.gz
 %endif
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/80-kvm.rules
 %endif
-install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/qemu-ga.service
+install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/qemu-ga@.service
 %if 0%{?is_opensuse}
 install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/ksm.service
 %endif
@@ -1185,19 +1185,19 @@ fi
 
 %pre guest-agent
 %{_bindir}/getent group kvm >/dev/null || %{_sbindir}/groupadd -r kvm
-%service_add_pre qemu-ga.service
+%service_add_pre qemu-ga@.service
 
 %preun guest-agent
-%service_del_preun qemu-ga.service
+%service_del_preun qemu-ga@.service
 
 %post guest-agent
-%service_add_post qemu-ga.service
+%service_add_post qemu-ga@.service
 if [ -e /dev/virtio-ports/org.qemu.guest_agent.0 ]; then
-  /usr/bin/systemctl start qemu-ga.service || :
+  /usr/bin/systemctl start qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0.service || :
 fi
 
 %postun guest-agent
-%service_del_postun qemu-ga.service
+%service_del_postun qemu-ga@.service
 
 %if 0%{?is_opensuse}
 %pre ksm
@@ -1446,7 +1446,7 @@ fi
 %defattr(-, root, root)
 %_mandir/man8/qemu-ga.8.gz
 %attr(0755,root,kvm) %_bindir/qemu-ga
-%{_unitdir}/qemu-ga.service
+%{_unitdir}/qemu-ga@.service
 %{_udevrulesdir}/80-qemu-ga.rules
 
 %if 0%{?is_opensuse}