summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrsiddall <rsiddall>2009-04-20 20:55:57 +0000
committerrsiddall <rsiddall>2009-04-20 20:55:57 +0000
commit4fafa0e68313d21c7cef6c67f624b6c4319b5ab7 (patch)
treed3e3bf243c3bb5327f1c68e24a52306e81f7b9db
parent56707979ef0b68c99e2b8f6eb4e46205f44c65ba (diff)
Acceptance testing of the RPM build system flushed out a place where /bin/rm
stops for input if you're running /bin/su as another user to do the build. Adding a -f flag to stop it asking for input.
-rw-r--r--install/rpm/freeside.spec2
1 files changed, 1 insertions, 1 deletions
diff --git a/install/rpm/freeside.spec b/install/rpm/freeside.spec
index 1e0a7e116..82fd173ab 100644
--- a/install/rpm/freeside.spec
+++ b/install/rpm/freeside.spec
@@ -135,7 +135,7 @@ For security reasons, it is set to conflict with %{name} as you should not insta
%prep
%setup -q
-%{__rm} bin/pod2x # Only useful to Ivan Kohler now
+%{__rm} -f bin/pod2x # Only useful to Ivan Kohler now
perl -pi -e 's|/usr/local/bin|%{_bindir}|g' FS/Makefile.PL
# RPM handles changing file ownership, so Makefile shouldn't
perl -pi -e 's/\s+-o\s+(freeside|root)(\s+-g\s+\$\{\w+\})?\s+/ /g' Makefile