rpms/monotone/FC-4 monotone-xfail-if-root.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 monotone.spec, 1.9, 1.10 sources, 1.3, 1.4 monotone-0.21-xfail-if-root.patch, 1.1, NONE

[Roland McGrath (roland)]

Author: roland

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

Modified Files:
	.cvsignore monotone.spec sources 
Added Files:
	monotone-xfail-if-root.patch 
Removed Files:
	monotone-0.21-xfail-if-root.patch 
Log Message:
New upstream version 0.23

monotone-xfail-if-root.patch:

--- NEW FILE monotone-xfail-if-root.patch ---
--- monotone-0.23/testsuite.~1~	2005-10-03 17:56:39.000000000 -0700
+++ monotone-0.23/testsuite	2005-10-03 17:57:22.000000000 -0700
@@ -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 -O /usr && at_xfail=yes
     (
       echo "64. t_checkout_dir.at:1: testing ..."
       $at_traceon
--- monotone-0.23/tests/t_checkout_dir.at.~1~	2005-10-03 17:56:38.000000000 -0700
+++ monotone-0.23/tests/t_checkout_dir.at	2005-10-03 17:57:25.000000000 -0700
@@ -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 -O /usr)
 AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
          [1], [ignore], [ignore])
 AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Aug 2005 20:46:24 -0000	1.3
+++ .cvsignore	4 Oct 2005 03:02:27 -0000	1.4
@@ -1 +1 @@
-monotone-0.22.tar.gz
+monotone-0.23.tar.gz


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- monotone.spec	24 Aug 2005 00:13:50 -0000	1.9
+++ monotone.spec	4 Oct 2005 03:02:27 -0000	1.10
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.22
-Release: 4%{?dist}
+Version: 0.23
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -11,7 +11,7 @@
 Source1: monotone.init
 Source2: monotone.sysconfig
 
-Patch1: monotone-0.21-xfail-if-root.patch
+Patch1: monotone-xfail-if-root.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,8 +21,8 @@
 %if 1
 %define bundled_sqlite yes
 %else
-# in fact, monotone has a locally-hacked 3.2.2, so we can't replace it
-BuildRequires: sqlite-devel >= 3.2.2
+# In fact, monotone has a locally-hacked 3.2.7, so we can't replace it.
+BuildRequires: sqlite-devel >= 3.2.7
 %define bundled_sqlite no
 %endif
 
@@ -70,6 +70,8 @@
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
 
+%find_lang %{name}
+
 lispdir=%{buildroot}%{_datadir}/emacs/site-lisp
 mkdir -p ${lispdir}
 %{__install} -c -m 0444 contrib/monotone*.el ${lispdir}
@@ -104,7 +106,7 @@
 	/sbin/install-info --delete %{_infodir}/monotone.info %{_infodir}/dir > /dev/null 2>&1 || :
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
@@ -142,6 +144,9 @@
 
 
 %changelog
+* Mon Oct  3 2005 Roland McGrath <roland at redhat.com> - 0.23-1
+- Updated for 0.23 release.
+
 * Mon Aug 22 2005 Roland McGrath <roland at redhat.com> - 0.22-4
 - Updated for 0.22 release.
 - Added monotone-server package.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Aug 2005 20:46:24 -0000	1.3
+++ sources	4 Oct 2005 03:02:27 -0000	1.4
@@ -1 +1 @@
-ee0f25577b8a640df3015113e67bb718  monotone-0.22.tar.gz
+6d9e909480c2be0b23e2820c3a42e6f1  monotone-0.23.tar.gz


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