Attachment 157365 Details for Bug 244370 – Fix inconsistent usage of macros.

[patch] Fix inconsistent usage of macros.

0006-Fix-inconsistent-usage-of-macros.patch (text/plain), 1.54 KB, created by Jeffrey C. Ollie on 2007-06-19 13:52:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeffrey C. Ollie

Created: 2007-06-19 13:52:14 UTC

Size: 1.54 KB

patch

obsolete

>From f5eed0ee86b04aa67bccf6d3a21975931aef3db5 Mon Sep 17 00:00:00 2001
>From: Jeffrey C. Ollie <jeff@ocjtech.us>
>Date: Tue, 19 Jun 2007 08:20:36 -0500
>Subject: [PATCH] Fix inconsistent usage of macros.
>
>Must use either $RPM_BUILD_ROOT or %{buildroot}, not a mixture of both.
>
>Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
>---
> olpc-hardware-manager.spec |    9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
>diff --git a/olpc-hardware-manager.spec b/olpc-hardware-manager.spec
>index fe6f78f..69708db 100644
>--- a/olpc-hardware-manager.spec
>+++ b/olpc-hardware-manager.spec
>@@ -1,6 +1,6 @@
> Name:           olpc-hardware-manager
> Version:        0.4.1
>-Release:        3%{?dist}
>+Release:        4%{?dist}
> Summary:        OLPC hardware manager
> 
> License:        GPL
>@@ -33,13 +33,13 @@ cp -p %{SOURCE3} .
> %build
> 
> %install
>-rm -rf $RPM_BUILD_ROOT
>+rm -rf %{buildroot}
> install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/dbus-1/system.d/olpc-hardware-manager.conf
> install -p -D -m 0755 %{SOURCE0} %{buildroot}%{_sysconfdir}/init.d/olpc-hardware-manager
> install -p -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/olpc-hardware-manager
> 
> %clean
>-rm -rf $RPM_BUILD_ROOT
>+rm -rf %{buildroot}
> 
> %post
> if [ "$1" == "1" ]; then
>@@ -60,6 +60,9 @@ fi
> %{_bindir}/olpc-hardware-manager
> 
> %changelog
>+* Tue Jun 19 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 0.4.1-4
>+- Fix inconsistent use of macros.
>+
> * Fri Jun 15 2007 Jeffrey C. Ollie <jeff@ocjtech.us> - 0.4.1-3
> - Copy the COPYING file to somewhere that the doc macro can find it.
> 
>-- 
>1.5.2.GIT
>

Actions: View | Diff

Attachments on bug 244370: 157147 | 157148 | 157149 | 157150 | 157170 | 157365 | 157366 | 157367