From ec49b3efa64a4e964e39dd443fc24deba47c7df3 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Thu, 7 Mar 2013 14:06:54 +0100
Subject: move stuff directly to /usr (#905492)

---
 initscripts.spec | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'initscripts.spec')

diff --git a/initscripts.spec b/initscripts.spec
index d5645c9a..fa8d9079 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -86,26 +86,26 @@ chown root:utmp /var/log/wtmp /var/run/utmp /var/log/btmp
 chmod 664 /var/log/wtmp /var/run/utmp
 chmod 600 /var/log/btmp
 
-/sbin/chkconfig --add network
-/sbin/chkconfig --add netconsole
+/usr/sbin/chkconfig --add network
+/usr/sbin/chkconfig --add netconsole
 if [ $1 -eq 1 ]; then
-        /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+        /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
 
 %preun
 if [ $1 = 0 ]; then
-  /sbin/chkconfig --del network
-  /sbin/chkconfig --del netconsole
+  /usr/sbin/chkconfig --del network
+  /usr/sbin/chkconfig --del netconsole
 fi
 
 %triggerun -- initscripts < 7.62
-/sbin/chkconfig --del random
-/sbin/chkconfig --del rawdevices
+/usr/sbin/chkconfig --del random
+/usr/sbin/chkconfig --del rawdevices
 exit 0
 
 %postun
 if [ $1 -ge 1 ]; then
-  /bin/systemctl daemon-reload > /dev/null 2>&1 || :
+  /usr/bin/systemctl daemon-reload > /dev/null 2>&1 || :
 fi
 
 %clean
@@ -119,10 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/sysconfig/netconsole
 %config(noreplace) /etc/sysconfig/readonly-root
 /etc/sysconfig/network-scripts/ifdown
-/sbin/ifdown
+/usr/sbin/ifdown
 /etc/sysconfig/network-scripts/ifdown-post
 /etc/sysconfig/network-scripts/ifup
-/sbin/ifup
+/usr/sbin/ifup
 %dir /etc/sysconfig/console
 %dir /etc/sysconfig/modules
 /etc/sysconfig/network-scripts/network-functions
@@ -161,8 +161,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/rwtab.d
 /etc/statetab
 %dir /etc/statetab.d
-/lib/systemd/fedora-*
-/lib/systemd/system/*
+/usr/lib/systemd/fedora-*
+/usr/lib/systemd/system/*
 %config(noreplace) /etc/inittab
 %dir /etc/rc.d
 %dir /etc/rc.d/rc[0-9].d
@@ -175,17 +175,17 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /etc/profile.d/debug*
 /etc/profile.d/*
 /usr/sbin/sys-unconfig
-/bin/ipcalc
-/bin/usleep
+/usr/bin/ipcalc
+/usr/bin/usleep
 %attr(4755,root,root) /usr/sbin/usernetctl
-/sbin/consoletype
-/sbin/genhostid
-/sbin/sushell
-%attr(2755,root,root) /sbin/netreport
-/lib/udev/rules.d/*
-/lib/udev/rename_device
-/sbin/service
-/sbin/ppp-watch
+/usr/sbin/consoletype
+/usr/sbin/genhostid
+/usr/sbin/sushell
+%attr(2755,root,root) /usr/sbin/netreport
+/usr/lib/udev/rules.d/*
+/usr/lib/udev/rename_device
+/usr/sbin/service
+/usr/sbin/ppp-watch
 %{_mandir}/man*/*
 %dir %attr(775,root,root) /var/run/netreport
 %dir /etc/ppp
@@ -205,8 +205,8 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
-%dir /lib/tmpfiles.d
-/lib/tmpfiles.d/initscripts.conf
+%dir /usr/lib/tmpfiles.d
+/usr/lib/tmpfiles.d/initscripts.conf
 %dir /usr/libexec/initscripts
 %dir /usr/libexec/initscripts/legacy-actions
 
-- 
cgit v1.2.1