[freeside-commits] freeside/rpm freeside.spec,1.1,1.2

[Richard Siddall]

Update of /home/cvs/cvsroot/freeside/rpm
In directory wavetail:/tmp/cvs-serv24031/rpm

Modified Files:
	freeside.spec 
Log Message:
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.


Index: freeside.spec
===================================================================
RCS file: /home/cvs/cvsroot/freeside/rpm/freeside.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- freeside.spec	15 Dec 2007 22:47:04 -0000	1.1
+++ freeside.spec	8 Feb 2008 21:59:00 -0000	1.2
@@ -94,6 +94,7 @@
 %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 @@
 
 %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