From: rsiddall Date: Mon, 20 Apr 2009 20:55:57 +0000 (+0000) Subject: Acceptance testing of the RPM build system flushed out a place where /bin/rm X-Git-Tag: freeside_1_7_4rc1~56 X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=4fafa0e68313d21c7cef6c67f624b6c4319b5ab7;p=freeside.git 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. --- 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