Accepting request 116278 from Virtualization

- update insserv part, see comments in OBS submit request #112701

OBS-URL: https://build.opensuse.org/request/show/116278
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hyper-v?expand=0&rev=2
This commit is contained in:
Stephan Kulow 2012-05-08 09:14:44 +00:00 committed by Git OBS Bridge
commit 1028166c9d
2 changed files with 12 additions and 10 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed May 2 12:13:03 CEST 2012 - ohering@suse.de
- update insserv part, see comments in OBS submit request #112701
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 27 08:50:43 CEST 2012 - ohering@suse.de Tue Mar 27 08:50:43 CEST 2012 - ohering@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package hyper-v # spec file for package hyper-v
# #
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 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
@ -15,7 +15,6 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
%define with_kmp 0 %define with_kmp 0
%if %{with_kmp} %if %{with_kmp}
@ -25,15 +24,17 @@
Name: hyper-v Name: hyper-v
%if %{with_kmp} %if %{with_kmp}
BuildRequires: kernel-default-devel module-init-tools BuildRequires: kernel-default-devel
BuildRequires: module-init-tools
%ifarch %ix86 %ifarch %ix86
BuildRequires: kernel-pae-devel BuildRequires: kernel-pae-devel
%endif %endif
%endif %endif
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
PreReq: %insserv_prereq PreReq: %insserv_prereq
Group: System/Kernel
Summary: Microsoft Hyper-V tools Summary: Microsoft Hyper-V tools
License: GPL-2.0
Group: System/Kernel
Supplements: modalias(dmi*:svn*MicrosoftCorporation*:pn*VirtualMachine*:rn*VirtualMachine*) Supplements: modalias(dmi*:svn*MicrosoftCorporation*:pn*VirtualMachine*:rn*VirtualMachine*)
Supplements: modalias(pci:v00001414d00005353sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001414d00005353sv*sd*bc*sc*i*)
Url: http://www.kernel.org Url: http://www.kernel.org
@ -48,7 +49,6 @@ Source5: hyper-v.kvptest.ps1.txt
Source9: hyper-v.include.linux.hyperv.h Source9: hyper-v.include.linux.hyperv.h
Source10: hyper-v.tools.hv.hv_kvp_daemon.c Source10: hyper-v.tools.hv.hv_kvp_daemon.c
Source11: hyper-v.init.sh Source11: hyper-v.init.sh
License: GPL-2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{with_kmp} %if %{with_kmp}
%if %{with_drivers_in_kmp} %if %{with_drivers_in_kmp}
@ -67,9 +67,8 @@ This package contains the Microsoft Hyper-V tools.
%package KMP %package KMP
Group: System/Kernel
Summary: Microsoft Hyper-V drivers Summary: Microsoft Hyper-V drivers
Group: System/Kernel
%description KMP %description KMP
This package contains the Microsoft Hyper-V drivers. This package contains the Microsoft Hyper-V drivers.
@ -156,9 +155,7 @@ fi
if test "${board_vendor}" = "Microsoft Corporation" -a "${product_name}" = "Virtual Machine" if test "${board_vendor}" = "Microsoft Corporation" -a "${product_name}" = "Virtual Machine"
then then
echo "Enabling %{hv_kvp_daemon} on '${product_name}' from '${board_vendor}'" echo "Enabling %{hv_kvp_daemon} on '${product_name}' from '${board_vendor}'"
%{fillup_and_insserv -Y %{hv_kvp_daemon}} %{insserv_force_if_yast %{hv_kvp_daemon}}
else
%{fillup_and_insserv %{hv_kvp_daemon}}
fi fi
%preun %preun