rpms/monotone/devel monotone-0.21-xfail-if-root.patch, NONE, 1.1 monotone.spec, 1.2, 1.3

[Roland McGrath (roland)]

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25411

Modified Files:
	monotone.spec 
Added Files:
	monotone-0.21-xfail-if-root.patch 
Log Message:
Work around non-root build user owning / in mock chroot builds.

monotone-0.21-xfail-if-root.patch:

--- NEW FILE monotone-0.21-xfail-if-root.patch ---
--- monotone-0.21/tests/t_checkout_dir.at
+++ monotone-0.21/tests/t_checkout_dir.at
@@ -16,7 +16,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
 mkdir test_dir3
 chmod 444 test_dir3
 # XFAIL if run as root (hi Gentoo!)
-AT_XFAIL_IF(test -O /)
+AT_XFAIL_IF(test -O /usr)
 AT_CHECK(MONOTONE --branch=testbranch checkout test_dir3,
          [1], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=testbranch checkout test_dir3/subdir,
--- monotone-0.21/testsuite
+++ monotone-0.21/testsuite
@@ -67905,7 +67905,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 -O /usr && at_xfail=yes
     (
       echo "64. t_checkout_dir.at:1: testing ..."
       $at_traceon


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.spec	27 Jul 2005 19:38:53 -0000	1.2
+++ monotone.spec	7 Aug 2005 10:06:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name: monotone
 Version: 0.21
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -9,6 +9,8 @@
 URL: http://www.venge.net/monotone/
 Source0: http://www.venge.net/monotone/downloads/%{name}-%{version}.tar.gz
 
+Patch1: monotone-0.21-xfail-if-root.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: boost-devel >= 1.32.0
@@ -24,6 +26,7 @@
 # The test suite needs cvs.
 BuildRequires: cvs
 
+# We need Emacs to byte-compile the Emacs Lisp code.
 BuildRequires: emacs
 
 Requires(post): /sbin/install-info
@@ -41,6 +44,8 @@
 %prep
 %setup -q
 
+%patch1 -p1
+
 %build
 %configure --with-bundled-lua=no --with-bundled-sqlite=%{bundled_sqlite}
 make %{?_smp_mflags}
@@ -84,6 +89,9 @@
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 %changelog
+* Sun Aug  7 2005 Roland McGrath <roland at redhat.com> - 0.21-3
+- Work around non-root build user owning / in mock chroot builds.
+
 * Wed Jul 27 2005 Roland McGrath <roland at redhat.com> - 0.21-2
 - Include monotone-nav.el too.
 - Add BuildRequires on cvs so the test suite can run.