X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=rhel%2Fopenvswitch.spec.in;h=3d6cda3b457720ca688e1abfffa38e8a20a38b5b;hb=d422c1189901d34125cd2d46552391c333d1f647;hp=14496e7ddb06629048256c3858160efe1eb18d6b;hpb=9d7c56431990fc56a1b26dd32c1e7a8d9258345f;p=sliver-openvswitch.git

diff --git a/rhel/openvswitch.spec.in b/rhel/openvswitch.spec.in
index 14496e7dd..3d6cda3b4 100644
--- a/rhel/openvswitch.spec.in
+++ b/rhel/openvswitch.spec.in
@@ -35,19 +35,22 @@ make %{_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-for base in \
-	etc_init.d_openvswitch \
-	etc_logrotate.d_openvswitch \
-	etc_sysconfig_network-scripts_ifup-ovs \
-	etc_sysconfig_network-scripts_ifdown-ovs \
-	usr_share_openvswitch_scripts_sysconfig.template; do
-    dst=$RPM_BUILD_ROOT/$(echo $base | sed 's,_,/,g')
-    install -d -m755 "$(dirname $dst)"
-    install rhel/$base "$dst"
-done
+
+rhel_cp() {
+ base=$1
+ mode=$2
+ dst=$RPM_BUILD_ROOT/$(echo $base | sed 's,_,/,g')
+ install -D -m $mode rhel/$base $dst
+}
+rhel_cp etc_init.d_openvswitch 0755
+rhel_cp etc_logrotate.d_openvswitch 0644
+rhel_cp etc_sysconfig_network-scripts_ifup-ovs 0755
+rhel_cp etc_sysconfig_network-scripts_ifdown-ovs 0755
+rhel_cp usr_share_openvswitch_scripts_sysconfig.template 0644
+
 docdir=$RPM_BUILD_ROOT/usr/share/doc/openvswitch-%{version}
 install -d -m755 "$docdir"
-install rhel/README.RHEL "$docdir"
+install -m 0644 rhel/README.RHEL "$docdir"
 install python/compat/uuid.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
 install python/compat/argparse.py $RPM_BUILD_ROOT/usr/share/openvswitch/python
 
@@ -103,7 +106,7 @@ exit 0
 %files
 %defattr(-,root,root)
 /etc/init.d/openvswitch
-/etc/logrotate.d/openvswitch
+%config(noreplace) /etc/logrotate.d/openvswitch
 /etc/sysconfig/network-scripts/ifup-ovs
 /etc/sysconfig/network-scripts/ifdown-ovs
 /etc/openvswitch/bugtool-plugins/*
@@ -144,7 +147,7 @@ exit 0
 /usr/share/openvswitch/python/
 /usr/share/openvswitch/scripts/ovs-bugtool-*
 /usr/share/openvswitch/scripts/ovs-ctl
-/usr/share/openvswitch/scripts/ovs-lib.sh
+/usr/share/openvswitch/scripts/ovs-lib
 /usr/share/openvswitch/scripts/ovs-save
 /usr/share/openvswitch/scripts/sysconfig.template
 /usr/share/openvswitch/vswitch.ovsschema