Accepting request 494514 from devel:openQA:tested

Re-enable dbus service installation

OBS-URL: https://build.opensuse.org/request/show/494514
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/os-autoinst?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2017-05-17 08:54:01 +00:00 committed by Git OBS Bridge
commit 68c28e500f
2 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu May 11 05:34:52 UTC 2017 - okurz@suse.com
- Re-enable dbus service installation
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 27 06:50:34 UTC 2017 - okurz@suse.com Thu Apr 27 06:50:34 UTC 2017 - okurz@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package os-autoinst # spec file for package os-autoinst
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX 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
@ -112,8 +112,6 @@ ln -s ../sbin/service %{buildroot}%{_sbindir}/rcos-autoinst-openvswitch
# #
# we need the stale symlinks to point to git # we need the stale symlinks to point to git
export NO_BRP_STALE_LINK_ERROR=yes export NO_BRP_STALE_LINK_ERROR=yes
# Disable service install for now, waiting for boo#1032649
rm -f %{buildroot}/etc/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
%check %check
# disable perlcritic - too heavy dependency on old systems # disable perlcritic - too heavy dependency on old systems
@ -177,8 +175,7 @@ make check VERBOSE=1
%defattr(-,root,root) %defattr(-,root,root)
%{_libexecdir}/os-autoinst/os-autoinst-openvswitch %{_libexecdir}/os-autoinst/os-autoinst-openvswitch
/usr/lib/systemd/system/os-autoinst-openvswitch.service /usr/lib/systemd/system/os-autoinst-openvswitch.service
# Disable service install for now, waiting for boo#1032649 %config /etc/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
#%%config /etc/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
%{_sbindir}/rcos-autoinst-openvswitch %{_sbindir}/rcos-autoinst-openvswitch
%changelog %changelog