rpms/guilt/devel guilt-0.32-fix-regression-test.patch, NONE, 1.1 guilt.spec, 1.4, 1.5

[Eric Sandeen]

Author: sandeen

Update of /cvs/pkgs/rpms/guilt/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29452

Modified Files:
	guilt.spec 
Added Files:
	guilt-0.32-fix-regression-test.patch 
Log Message:
* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32-2
- New upstream version, supports newer git (1.6)
- Fix minor regression test problem


guilt-0.32-fix-regression-test.patch:

--- NEW FILE guilt-0.32-fix-regression-test.patch ---
Index: guilt-0.32/regression/t-030.out
===================================================================
--- guilt-0.32.orig/regression/t-030.out	2009-01-16 14:14:26.000000000 -0600
+++ guilt-0.32/regression/t-030.out	2009-01-16 14:16:20.353575541 -0600
@@ -1,6 +1,6 @@
 % setup_repo
 % guilt-commit
-Usage: guilt-commit -n <num> | -a | --all
+Usage: guilt commit -n <num> | -a | --all
 % list_files
 d .git/patches
 d .git/patches/master
@@ -60,7 +60,7 @@ Patch applied.
 Applying patch..mode
 Patch applied.
 % guilt-commit
-Usage: guilt-commit -n <num> | -a | --all
+Usage: guilt commit -n <num> | -a | --all
 % list_files
 d .git/patches
 d .git/patches/master
Index: guilt-0.32/regression/scaffold
===================================================================
--- guilt-0.32.orig/regression/scaffold	2009-01-16 13:36:50.000000000 -0600
+++ guilt-0.32/regression/scaffold	2009-01-16 14:18:59.013575047 -0600
@@ -27,6 +27,7 @@ function replace_path
 {
 	sed -e "s,$PWD,PATH,g" \
 	    -e "s,$REG_DIR/\.\./,,g" \
+	    -e "s,Usage: guilt-,Usage: guilt ,g" \
 	    -e "s,\.\.\. initial, initial,g" \
 	    -e "s,^Already on branch,Already on,g"
 }


Index: guilt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guilt/devel/guilt.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- guilt.spec	16 Jan 2009 19:57:55 -0000	1.4
+++ guilt.spec	16 Jan 2009 20:23:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		guilt
 Version:	0.32
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Scripts to manage quilt-like patches on top of git
 
 Group:		Development/Tools
@@ -13,6 +13,8 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	asciidoc, xmlto, git-core
 
+Patch0:		guilt-0.32-fix-regression-test.patch
+
 %description
 Guilt allows one to use quilt functionality on top of a Git repository.
 Changes are maintained as patches which are committed into Git.  Commits can
@@ -23,6 +25,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -46,8 +49,9 @@
 %{_mandir}/man7/guilt*.7*
 
 %changelog
-* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32
+* Fri Jan 16 2009 Eric Sandeen <sandeen at redhat.com> 0.32-2
 - New upstream version, supports newer git (1.6)
+- Fix minor regression test problem
 
 * Tue Jun 02 2008 Eric Sandeen <sandeen at redhat.com> 0.30-2
 - Fix regression test output for new versions of git (#440169)