[trac-git-plugin/f14] New bugfix update

Jesse Keating jkeating at fedoraproject.org
Mon Jun 13 22:09:05 UTC 2011


commit 5d7b9a6ce50cb258a0255831b843dae41c7ddf93
Author: Jesse Keating <jkeating at redhat.com>
Date:   Mon Jun 13 15:05:19 2011 -0700

    New bugfix update

 fix-git-submodule.patch |   11 +++++++++++
 trac-git-plugin.spec    |    7 ++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/fix-git-submodule.patch b/fix-git-submodule.patch
new file mode 100644
index 0000000..48830bb
--- /dev/null
+++ b/fix-git-submodule.patch
@@ -0,0 +1,11 @@
+--- a/TracGit-0.11.0.2/tracext/git/git_fs.py    
++++ a/TracGit-0.11.0.2/tracext/git/git_fs.py    
+@@ -300,6 +300,8 @@ class GitNode(Node):
+                                 pass
+                         elif k=='blob':
+                                 kind = Node.FILE
++                        elif k=='commit':
++                                pass
+                         else:
+                                 raise TracError("internal error (got unexpected object kind '%s')" % k)
+
diff --git a/trac-git-plugin.spec b/trac-git-plugin.spec
index 248f2a7..838fc6f 100644
--- a/trac-git-plugin.spec
+++ b/trac-git-plugin.spec
@@ -5,7 +5,7 @@
 
 Name:           trac-git-plugin
 Version:        0.11.0.2
-Release:        6.20090511svn%{svnrev}%{?dist}
+Release:        7.20090511svn%{svnrev}%{?dist}
 Summary:        GIT version control plugin for Trac
 
 Group:          Applications/Internet
@@ -23,12 +23,14 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 Requires:       git-core, trac >= 0.11, python-setuptools
+Patch0:         fix-git-submodule.patch
 
 %description
 This Trac plugin provides support for the GIT SCM.
 
 %prep
 %setup -n TracGit-%{version} -q
+%patch0 -p2
 
 
 %build
@@ -57,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 13 2011 Jesse Keating <jkeating at redhat.com> - 0.11.0.2-7.20090511svn5396
+- Patch to work around submodules (#580702)
+
 * Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.11.0.2-6.20090511svn5396
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 


More information about the scm-commits mailing list