rpms/trac-bazaar-plugin/devel sources, 1.3, 1.4 trac-bazaar-extra-return.patch, 1.1, 1.2 trac-bazaar-plugin.spec, 1.4, 1.5 trac-bazaar-escape.patch, 1.1, NONE trac-bazaar-timestamp.patch, 1.1, NONE

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/trac-bazaar-plugin/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15561

Modified Files:
	sources trac-bazaar-extra-return.patch trac-bazaar-plugin.spec 
Removed Files:
	trac-bazaar-escape.patch trac-bazaar-timestamp.patch 
Log Message:

* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
- New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
  trac-0.11.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Aug 2007 22:58:23 -0000	1.3
+++ sources	26 Sep 2008 00:42:59 -0000	1.4
@@ -1 +1 @@
-ee40f6f28c64aee420a798c1543b1bca  TracBzr-0.2.tar.gz
+d3d98e6166e3b0b8562883793992c48e  TracBzr-0.2.tar.gz

trac-bazaar-extra-return.patch:

Index: trac-bazaar-extra-return.patch
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-extra-return.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- trac-bazaar-extra-return.patch	22 Sep 2007 19:37:24 -0000	1.1
+++ trac-bazaar-extra-return.patch	26 Sep 2008 00:42:59 -0000	1.2
@@ -1,7 +1,9 @@
 === modified file 'tracbzr/backend.py'
---- tracbzr/backend.py	2007-09-22 17:26:55 +0000
-+++ tracbzr/backend.py	2007-09-22 17:48:32 +0000
-@@ -231,7 +231,6 @@
+Index: tracbzr/backend.py
+===================================================================
+--- tracbzr/backend.py.orig
++++ tracbzr/backend.py
+@@ -237,7 +237,6 @@ class BzrRepository(versioncontrol.Repos
          revid = urllib.unquote(rev)
          if revid in ('current:', 'null:'):
              return None, revid
@@ -9,4 +11,3 @@
          if self.repo.has_revision(revid):
              return None, revid
  
-


Index: trac-bazaar-plugin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/trac-bazaar-plugin/devel/trac-bazaar-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- trac-bazaar-plugin.spec	22 Sep 2007 19:37:24 -0000	1.4
+++ trac-bazaar-plugin.spec	26 Sep 2008 00:42:59 -0000	1.5
@@ -1,26 +1,23 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
-%define bzrrev 182
+%define bzrrev 49
 
 Name:           trac-bazaar-plugin
 Version:        0.2
-Release:        5.20070829bzr%{bzrrev}%{?dist}
+Release:        6.20080925bzr%{bzrrev}%{?dist}
 Summary:        Bazaar plugin for Trac
 
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bazaar-vcs.org/TracBzr
 # Source comes from a bazaar repository:
-#   bzr checkout --lightweight -r 182 http://panoramicfeedback.com/opensource/trac+bzr/
-#   cd trac+bzr
+#   bzr checkout --lightweight -r 49 lp:trac-bzr
+#   cd trac-bzr
 #   python setup.py sdist --formats gztar
-# tarball lands in trac+bzr/dist/
+# tarball lands in trac-bzr/dist/
 Source0:        TracBzr-%{version}.tar.gz
-# These two are part of https://bugs.launchpad.net/trac-bzr/+bug/116659
-Patch0: trac-bazaar-timestamp.patch
-Patch1: trac-bazaar-escape.patch
-# Communicated this directly with author
-Patch2: trac-bazaar-extra-return.patch
+# https://bugs.launchpad.net/trac-bzr/+bug/274609
+Patch0: trac-bazaar-extra-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -40,8 +37,6 @@
 %prep
 %setup -n TracBzr-%{version} -q
 %patch0 -p0
-%patch1 -p0
-%patch2 -p0
 
 %build
 %{__python} setup.py build
@@ -49,9 +44,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# skip-build doesn't work on el4
-%{__python} setup.py install -O1 --root $RPM_BUILD_ROOT
- 
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
@@ -62,6 +56,10 @@
 %{python_sitelib}/*
 
 %changelog
+* Thu Sep 25 2008 Toshio Kuratomi <toshio at fedoraproject.org> - 0.2-6.20080925bzr49
+- New upstream snapshot that includes our patches, fixes for bzr-1.6+ and
+  trac-0.11.
+
 * Sat Sep 22 2007 Toshio Kuratomi <a.badger at gmail.com> - 0.2-5.20070829bzr182
 - Patches to fix RSS feed in timeline view.
 


--- trac-bazaar-escape.patch DELETED ---


--- trac-bazaar-timestamp.patch DELETED ---