rpms/monotone/FC-4 monotone-xfail-if-root.patch, 1.2, 1.3 monotone.spec, 1.13, 1.14

[Roland McGrath (roland)]

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31536

Modified Files:
	monotone.spec 
Added Files:
	monotone-xfail-if-root.patch 
Log Message:
Test suite patch for mock builds to cope

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: monotone-xfail-if-root.patch
diff -N monotone-xfail-if-root.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ monotone-xfail-if-root.patch	6 Jan 2006 10:27:47 -0000	1.3
@@ -0,0 +1,22 @@
+--- monotone-0.23/testsuite
++++ monotone-0.23/testsuite
+@@ -67479,7 +67479,7 @@ $at_traceon
+     at_desc='checkout validates target directory'
+     $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
+     at_xfail=no
+-      test -O / && at_xfail=yes
++      test -w test_dir4 && at_xfail=yes
+     (
+       echo "64. t_checkout_dir.at:1: testing ..."
+       $at_traceon
+--- monotone-0.23/tests/t_checkout_dir.at
++++ monotone-0.23/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- monotone.spec	6 Jan 2006 09:29:34 -0000	1.13
+++ monotone.spec	6 Jan 2006 10:27:47 -0000	1.14
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.25
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -12,6 +12,8 @@
 Source2: monotone.sysconfig
 Source3: README.monotone-server
 
+Patch1: monotone-xfail-if-root.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: zlib-devel
@@ -59,6 +61,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure --with-bundled-lua=%{bundled_lua} \
 	   --with-bundled-sqlite=%{bundled_sqlite}
@@ -162,6 +166,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
+- Restore testsuite fix for nonroot owner of / in build chroot.
+
 * Thu Jan  5 2006 Roland McGrath <roland at redhat.com> - 0.25-1
 - Updated for 0.25 release.