From: Flavio Leitner <fbl@redhat.com>
Date: Thu, 6 Nov 2014 18:45:43 +0000 (-0200)
Subject: fedora-spec: use RPM macros in %install section
X-Git-Tag: v2.4.0~1021
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=4f98e02e6c742540b90899ceccc6d888d8b18eea

fedora-spec: use RPM macros in %install section

Signed-off-by: Flavio Leitner <fbl@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/rhel/openvswitch-fedora.spec.in b/rhel/openvswitch-fedora.spec.in
index 96b808ebc..080a460a0 100644
--- a/rhel/openvswitch-fedora.spec.in
+++ b/rhel/openvswitch-fedora.spec.in
@@ -92,7 +92,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-install -d -m 755 $RPM_BUILD_ROOT/etc
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}
 install -d -m 0755 $RPM_BUILD_ROOT%{_sysconfdir}/openvswitch
 install -p -D -m 0644 rhel/usr_lib_systemd_system_openvswitch.service \
         $RPM_BUILD_ROOT%{_unitdir}/openvswitch.service
@@ -100,28 +100,28 @@ install -p -D -m 0644 rhel/usr_lib_systemd_system_openvswitch-nonetwork.service
         $RPM_BUILD_ROOT%{_unitdir}/openvswitch-nonetwork.service
 install -m 755 rhel/etc_init.d_openvswitch \
         $RPM_BUILD_ROOT%{_datadir}/openvswitch/scripts/openvswitch.init
-install -d -m 755 $RPM_BUILD_ROOT/etc/sysconfig
-install -d -m 755 $RPM_BUILD_ROOT/etc/logrotate.d
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
 install -m 755 rhel/etc_logrotate.d_openvswitch \
-        $RPM_BUILD_ROOT/etc/logrotate.d/openvswitch
-install -d -m 755 $RPM_BUILD_ROOT/etc/profile.d
+        $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/openvswitch
+install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d
 install -m 644 vswitchd/vswitch.ovsschema \
-        $RPM_BUILD_ROOT/usr/share/openvswitch/vswitch.ovsschema
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
-install -d -m 0755 $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/
+        $RPM_BUILD_ROOT/%{_datadir}/openvswitch/vswitch.ovsschema
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/openvswitch/scripts
+install -d -m 0755 $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/
 install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifdown-ovs \
-        $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifdown-ovs
+        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifdown-ovs
 install -p -m 0755 rhel/etc_sysconfig_network-scripts_ifup-ovs \
-        $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ovs
+        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/network-scripts/ifup-ovs
 install -p -D -m 0644 rhel/usr_share_openvswitch_scripts_systemd_sysconfig.template \
-        $RPM_BUILD_ROOT/etc/sysconfig/openvswitch
-install -d -m 755 $RPM_BUILD_ROOT/usr/share/openvswitch/scripts
+        $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/openvswitch
+install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/openvswitch/scripts
 
 install -d -m 0755 $RPM_BUILD_ROOT%{python_sitelib}
 mv $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/* $RPM_BUILD_ROOT%{python_sitelib}
 rmdir $RPM_BUILD_ROOT/%{_datadir}/openvswitch/python/
 
-install -d -m 755 $RPM_BUILD_ROOT/var/lib/openvswitch
+install -d -m 755 $RPM_BUILD_ROOT/%{_sharedstatedir}/openvswitch
 
 install -d -m 0755 $RPM_BUILD_ROOT%{_includedir}/openvswitch
 install -p -D -m 0644 include/openvswitch/*.h \