From: rsiddall Date: Mon, 20 Apr 2009 20:57:31 +0000 (+0000) Subject: Acceptance testing of the RPM build system flushed out a place where /bin/rm X-Git-Tag: root_of_svc_elec_features~1252 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=63bfee7f715403c6ff5d145c09b730928fce2100 Acceptance testing of the RPM build system flushed out a place where /bin/rm stops waiting for input if you're /bin/su as the user doing the build. Added a -f flag to stop it waiting for input. --- diff --git a/rpm/freeside.spec b/rpm/freeside.spec index 306008924..172b458b3 100644 --- a/rpm/freeside.spec +++ b/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