From 7c0e01319b4adb4f659ea06f01cf004202e14a30 Mon Sep 17 00:00:00 2001 From: rsiddall Date: Fri, 8 Feb 2008 21:59:00 +0000 Subject: [PATCH] Removed code that create a freeside user on the build machine and added code to modify Makefile to remove clauses that require such a user. This should allow the RPMs to build under mock. --- rpm/freeside.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rpm/freeside.spec b/rpm/freeside.spec index 8a07bcc22..897b2dfe7 100644 --- a/rpm/freeside.spec +++ b/rpm/freeside.spec @@ -94,6 +94,7 @@ For security reasons, it is set to conflict with %{name} so you cannot install t %setup %{__rm} bin/pod2x # Only useful to Ivan Kohler now perl -pi -e 's|/usr/local/bin|%{buildroot}%{_bindir}|g' FS/Makefile.PL +perl -pi -e 's|\s+-o\s+freeside\s+| |g' Makefile perl -ni -e 'print if !/\s+chown\s+/;' Makefile # Override find-requires/find-provides to supplement Perl requires for HTML::Mason file handler.pl @@ -113,8 +114,6 @@ EOF %build -# Add freeside user and group if there isn't already such a user -%{__id} freeside 2>/dev/null >/dev/null || /usr/sbin/useradd -s /bin/sh freeside # False laziness... # The htmlman target now makes wiki documentation. Let's pretend we made it. touch htmlman -- 2.11.0