[olpc-powerd] further cleanups

Peter Robinson pbrobinson at fedoraproject.org
Sat Nov 19 22:59:53 UTC 2011


commit 752b9a7ecc9307aa6ff05ca413405835df8b7c60
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sat Nov 19 22:59:35 2011 +0000

    further cleanups

 olpc-powerd.spec |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/olpc-powerd.spec b/olpc-powerd.spec
index 9d5d0bd..aac1521 100644
--- a/olpc-powerd.spec
+++ b/olpc-powerd.spec
@@ -48,19 +48,19 @@ export OPT_FLAGS="$RPM_OPT_FLAGS"
 make
 
 %install
-mkdir -p %{buildroot}/%{_sbindir}
-mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{_libexecdir}
+mkdir -p %{buildroot}%{_sbindir}
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_libexecdir}
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d
 mkdir -p %{buildroot}%{_sysconfdir}/powerd
 mkdir -p %{buildroot}%{_sysconfdir}/powerd/postresume.d
 mkdir -p %{buildroot}%{_sysconfdir}/powerd/flags
 
-install -p -m 755 olpc-switchd %{buildroot}/%{_sbindir}/olpc-switchd
-install -p -m 755 powerd %{buildroot}/%{_sbindir}/powerd
-install -p -m 755 pnmto565fb %{buildroot}/%{_bindir}/pnmto565fb
-install -p -m 755 powerd-config %{buildroot}/%{_bindir}/powerd-config
-install -p -m 755 olpc-nosleep %{buildroot}/%{_bindir}/olpc-nosleep
+install -p -m 755 olpc-switchd %{buildroot}%{_sbindir}/olpc-switchd
+install -p -m 755 powerd %{buildroot}%{_sbindir}/powerd
+install -p -m 755 pnmto565fb %{buildroot}%{_bindir}/pnmto565fb
+install -p -m 755 powerd-config %{buildroot}%{_bindir}/powerd-config
+install -p -m 755 olpc-nosleep %{buildroot}%{_bindir}/olpc-nosleep
 install -p -m 644 pleaseconfirm.pgm %{buildroot}%{_sysconfdir}/powerd/pleaseconfirm.pgm
 install -p -m 644 shuttingdown.pgm %{buildroot}%{_sysconfdir}/powerd/shuttingdown.pgm
 install -p -m 644 powerd.conf.dist %{buildroot}%{_sysconfdir}/powerd/powerd.conf
@@ -71,9 +71,9 @@ install -p -m 644 usb-inhibits %{buildroot}%{_sysconfdir}/powerd/flags/usb-inhib
 install -p -m 755 powerd-dbus/powerd-dbus %{buildroot}%{_libexecdir}/powerd-dbus
 install -p -m 644 powerd-dbus/powerd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/powerd.conf
 
-install -d %{buildroot}/lib/systemd/system
-install -p -m 644 %{SOURCE1} %{buildroot}/lib/systemd/system/powerd.service
-install -p -m 644 %{SOURCE2} %{buildroot}/lib/systemd/system/olpc-switchd.service
+install -d %{buildroot}lib/systemd/system
+install -p -m 644 %{SOURCE1} %{buildroot}lib/systemd/system/powerd.service
+install -p -m 644 %{SOURCE2} %{buildroot}lib/systemd/system/olpc-switchd.service
 
 %files
 %defattr(-,root,root,-)


More information about the scm-commits mailing list