From d77c8696dc22b102bd41430cfa59bdc4bdbfe5b1 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Sep 17 2006 16:13:07 +0000
Subject: 0.10


---

diff --git a/.cvsignore b/.cvsignore
index 597eb5b..4bd6ab3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bzr-0.9.tar.gz
+bzr-0.10.tar.gz
diff --git a/bzr-sys-etree.patch b/bzr-sys-etree.patch
deleted file mode 100644
index 2f513f9..0000000
--- a/bzr-sys-etree.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urN bzr-0.9.orig/bzrlib/xml_serializer.py bzr-0.9/bzrlib/xml_serializer.py
---- bzr-0.9.orig/bzrlib/xml_serializer.py	2006-08-11 03:35:06.000000000 -0700
-+++ bzr-0.9/bzrlib/xml_serializer.py	2006-08-11 08:37:01.000000000 -0700
-@@ -31,10 +31,10 @@
- except ImportError:
-     mutter('WARNING: using slower ElementTree; consider installing cElementTree'
-            " and make sure it's on your PYTHONPATH")
--    from util.elementtree.ElementTree import (ElementTree, SubElement,
-+    from elementtree.ElementTree import (ElementTree, SubElement,
-                                               Element, XMLTreeBuilder,
-                                               fromstring, tostring)
--    import util.elementtree as elementtree
-+    import elementtree
- 
- from bzrlib.errors import BzrError
- 
-diff -urN bzr-0.9.orig/setup.py bzr-0.9/setup.py
---- bzr-0.9.orig/setup.py	2006-08-11 03:35:06.000000000 -0700
-+++ bzr-0.9/setup.py	2006-08-11 08:35:29.000000000 -0700
-@@ -112,7 +112,6 @@
-                 'bzrlib.transport.http',
-                 'bzrlib.ui',
-                 'bzrlib.util',
--                'bzrlib.util.elementtree',
-                 'bzrlib.util.effbot.org',
-                 'bzrlib.util.configobj',
-                 'bzrlib.bundle',
diff --git a/bzr.spec b/bzr.spec
index c9bbeb0..ebba77e 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           bzr
-Version:        0.9
+Version:        0.10
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -9,7 +9,6 @@ Group:          Development/Tools
 License:        GPL
 URL:            http://www.bazaar-ng.org/
 Source0:        http://www.bazaar-ng.org/pkg/%{name}-%{version}.tar.gz
-Patch0:         bzr-sys-etree.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -25,7 +24,6 @@ a user-friendly reimplementation of GNU Arch.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -35,6 +33,11 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
 
+# This is included in %doc, remove redundancy here
+#rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/doc/
+
+# Use independently packaged python-elementtree instead
+rm -rf $RPM_BUILD_ROOT%{python_sitelib}/bzrlib/util/elementtree/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,6 +59,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/bzrlib/benchmarks/*.pyc
 %{python_sitelib}/bzrlib/benchmarks/*.pyo
 
+%dir %{python_sitelib}/bzrlib/benchmarks/tree_creator
+%{python_sitelib}/bzrlib/benchmarks/tree_creator/*.py
+%{python_sitelib}/bzrlib/benchmarks/tree_creator/*.pyc
+%{python_sitelib}/bzrlib/benchmarks/tree_creator/*.pyo
+
 %dir %{python_sitelib}/bzrlib/bundle
 %{python_sitelib}/bzrlib/bundle/*.py
 %{python_sitelib}/bzrlib/bundle/*.pyc
@@ -75,6 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/bzrlib/doc/api/*.py
 %{python_sitelib}/bzrlib/doc/api/*.pyc
 %{python_sitelib}/bzrlib/doc/api/*.pyo
+%{python_sitelib}/bzrlib/doc/api/*.txt
 
 %dir %{python_sitelib}/bzrlib/export
 %{python_sitelib}/bzrlib/export/*.py
@@ -101,6 +110,11 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/bzrlib/util/configobj/*.pyc
 %{python_sitelib}/bzrlib/util/configobj/*.pyo
 
+%dir %{python_sitelib}/bzrlib/util/effbot
+%{python_sitelib}/bzrlib/util/effbot/*.py
+%{python_sitelib}/bzrlib/util/effbot/*.pyc
+%{python_sitelib}/bzrlib/util/effbot/*.pyo
+
 %dir %{python_sitelib}/bzrlib/transport
 %{python_sitelib}/bzrlib/transport/*.py
 %{python_sitelib}/bzrlib/transport/*.pyc
@@ -140,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/bzrlib/tests/*
 
 %changelog
+* Sun Sep 17 2006 Warren Togami <wtogami@redhat.com> 0.10-1
+- 0.10
+
 * Fri Aug 11 2006 Shahms E. King <shahms@shahms.com> 0.9-1
 - Update to new upstream
 
diff --git a/needs.rebuild b/needs.rebuild
deleted file mode 100644
index 815fd29..0000000
--- a/needs.rebuild
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild
diff --git a/sources b/sources
index 610c318..37fe816 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46a3320a7830b13516bef084bb87d86c  bzr-0.9.tar.gz
+8a21693efe9b06bed04fa4e8a74b7e83  bzr-0.10.tar.gz