summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--zenity.spec.in6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b37237c2..0088e8ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-07 Glynn Foster <glynn.foster@sun.com>
+
+ * zenity.spec.in: More updates.
+
2003-03-06 Glynn Foster <glynn.foster@sun.com>
* zenity.spec.in: Fix up the %defines to include
diff --git a/zenity.spec.in b/zenity.spec.in
index 16133b5b..c9867793 100644
--- a/zenity.spec.in
+++ b/zenity.spec.in
@@ -53,7 +53,7 @@ Zenity is especially useful in scripts.
%prep
%setup -q
-%{__rm} -rf $RPM_BUILD_ROOT
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%build
@@ -62,12 +62,12 @@ Zenity is especially useful in scripts.
%install
-%{__rm} -rf $RPM_BUILD_ROOT%{rpm_prefix}
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%{__make} prefix=$RPM_BUILD_ROOT%{rpm_prefix} install
%clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT%{rpm_prefix}
%files
bgstack15