[trac-git-plugin/el5] Bugfix update for git submodule workaround
Jesse Keating
jkeating at fedoraproject.org
Mon Jun 13 22:20:39 UTC 2011
commit 5e1cda397cfc6d60b9fcf348fb4acec962795fb2
Author: Jesse Keating <jkeating at redhat.com>
Date: Mon Jun 13 15:19:03 2011 -0700
Bugfix update for git submodule workaround
fix-git-submodule.patch | 12 ++++++++++++
trac-git-plugin.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/fix-git-submodule.patch b/fix-git-submodule.patch
new file mode 100644
index 0000000..4a48b5a
--- /dev/null
+++ b/fix-git-submodule.patch
@@ -0,0 +1,12 @@
+diff -up TracGit-0.0.1/gitplugin/git_fs.py.jk TracGit-0.0.1/gitplugin/git_fs.py
+--- TracGit-0.0.1/gitplugin/git_fs.py.jk 2011-06-13 15:15:45.705361473 -0700
++++ TracGit-0.0.1/gitplugin/git_fs.py 2011-06-13 15:16:40.567862698 -0700
+@@ -178,6 +178,8 @@ class GitNode(Node):
+ pass
+ elif k=='blob':
+ kind = Node.FILE
++ elif k=='commit':
++ pass
+ else:
+ self.log.debug("kind is "+k)
+
diff --git a/trac-git-plugin.spec b/trac-git-plugin.spec
index 1350b45..1bc2032 100644
--- a/trac-git-plugin.spec
+++ b/trac-git-plugin.spec
@@ -5,7 +5,7 @@
Name: trac-git-plugin
Version: 0.0.1
-Release: 5.20090628svn%{svnrev}%{?dist}
+Release: 6.20090628svn%{svnrev}%{?dist}
Summary: GIT version control plugin for Trac
Group: Applications/Internet
@@ -22,12 +22,14 @@ BuildArch: noarch
BuildRequires: python-devel
BuildRequires: python-setuptools
Requires: git-core, trac, python-setuptools
+Patch0: fix-git-submodule.patch
%description
This Trac plugin provides support for the GIT SCM.
%prep
%setup -n TracGit-%{version} -q
+%patch0 -p1
%build
@@ -55,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jun 13 2011 Jesse Keating <jkeating at redhat.com> - 0.0.1-6.20090628svn3369
+- Patch for git submodules (#580702)
+
* Sun Jun 28 2009 Jesse Keating <jkeating at redhat.com> - 0.0.1-5.20090628svn3369
- New snapshot from upstream with fixes.
- Drop patches from nanosleep as they no longer apply
More information about the scm-commits
mailing list