rpms/monotone/F-7 monotone.spec,1.28,1.29

[Roland McGrath (roland)]

Author: roland

Update of /cvs/pkgs/rpms/monotone/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16393/F-7

Modified Files:
	monotone.spec 
Log Message:
Exclude ppc for #259161 miscompilation issue.


Index: monotone.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone/F-7/monotone.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- monotone.spec	3 Aug 2007 11:08:18 -0000	1.28
+++ monotone.spec	28 Aug 2007 07:39:02 -0000	1.29
@@ -1,6 +1,10 @@
 Name: monotone
 Version: 0.36
-Release: 1%{?dist}
+Release: 2%{?dist}
+
+# XXX temporary pending bug fix for miscompilation(?) on ppc
+# See https://bugzilla.redhat.com/show_bug.cgi?id=259161
+ExcludeArch: ppc ppc64
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -50,7 +54,7 @@
 %package server
 Summary: Standalone server setup for monotone
 Requires: monotone = %{version}-%{release}
-Requires(pre): /usr/sbin/useradd
+Requires(pre): shadow-utils
 Requires(post): /sbin/service, /sbin/chkconfig
 Requires(preun): /sbin/service, /sbin/chkconfig
 Group: Development/Tools
@@ -149,9 +153,12 @@
 %attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) %{_localstatedir}/db/monotone/server.mtn
 
 %pre server
-# Add the "monotone" user
-/usr/sbin/useradd -c "Monotone Netsync Server" \
-	-s /sbin/nologin -r -d %{_localstatedir}/db/monotone monotone 2> /dev/null || :
+# Add "monotone" user per http://fedoraproject.org/wiki/Packaging/UsersAndGroups
+getent group monotone > /dev/null || groupadd -r monotone
+getent passwd monotone > /dev/null ||
+useradd -r -g monotone -r -d %{_localstatedir}/db/monotone -s /sbin/nologin \
+	-c "Monotone Netsync Server"
+exit 0
 
 %post server
 # Register the monotone service
@@ -168,6 +175,10 @@
 
 
 %changelog
+* Tue Aug 28 2007 Roland McGrath <roland at redhat.com> - 0.36-2
+- Clean up %%pre script per packaging guidelines.
+- Disable ppc and ppc64 builds temporarily since make check fails. (#259161)
+
 * Fri Aug  3 2007 Roland McGrath <roland at redhat.com> - 0.36-1
 - Updated for 0.36 release.