From b861e778d1b6f6b0078ac4f8fc3d443e4591f5944e32af4a315b1ff4ccc16922 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 17 Dec 2013 22:37:20 +0000 Subject: [PATCH] Use helper_dir macro OBS-URL: https://build.opensuse.org/package/show/Virtualization/hyper-v?expand=0&rev=79 --- hyper-v.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/hyper-v.spec b/hyper-v.spec index 9ed610c..19ea0d2 100644 --- a/hyper-v.spec +++ b/hyper-v.spec @@ -18,6 +18,7 @@ %define hv_kvp_daemon hv_kvp_daemon %define hv_vss_daemon hv_vss_daemon +%define helper_dir /usr/lib/%{name} Name: hyper-v ExclusiveArch: %ix86 x86_64 @@ -84,11 +85,11 @@ gcc \ mkdir -p $RPM_BUILD_ROOT/usr/sbin install -m755 %{hv_kvp_daemon} $RPM_BUILD_ROOT/usr/sbin install -m755 %{hv_vss_daemon} $RPM_BUILD_ROOT/usr/sbin -mkdir -p $RPM_BUILD_ROOT/usr/lib/%{name}/bin -cp -avL %{S:20} $RPM_BUILD_ROOT/usr/lib/%{name}/bin/hv_get_dhcp_info -cp -avL %{S:21} $RPM_BUILD_ROOT/usr/lib/%{name}/bin/hv_get_dns_info -cp -avL %{S:22} $RPM_BUILD_ROOT/usr/lib/%{name}/bin/hv_set_ifconfig -chmod 755 $RPM_BUILD_ROOT/usr/lib/%{name}/bin/* +mkdir -p $RPM_BUILD_ROOT%{helper_dir}/bin +cp -avL %{S:20} $RPM_BUILD_ROOT%{helper_dir}/bin/hv_get_dhcp_info +cp -avL %{S:21} $RPM_BUILD_ROOT%{helper_dir}/bin/hv_get_dns_info +cp -avL %{S:22} $RPM_BUILD_ROOT%{helper_dir}/bin/hv_set_ifconfig +chmod 755 $RPM_BUILD_ROOT%{helper_dir}/bin/* mkdir -p $RPM_BUILD_ROOT/etc/init.d install -m755 %{S:11} $RPM_BUILD_ROOT/etc/init.d/%{hv_kvp_daemon} ln -sfvbn ../../etc/init.d/%{hv_kvp_daemon} $RPM_BUILD_ROOT/usr/sbin/rc%{hv_kvp_daemon} @@ -100,7 +101,7 @@ ln -sfvbn ../../etc/init.d/%{hv_vss_daemon} $RPM_BUILD_ROOT/usr/sbin/rc%{hv_vss_ %doc kvptest.ps1.txt /etc/init.d/* /usr/sbin/* -/usr/lib/%{name} +%{helper_dir} %pre # hv_kvp_daemon in SLES11 SP2 stored temporary state files in /var/opt