From 65b410258937751a88c6473efb0cd2c7e4e85951 Mon Sep 17 00:00:00 2001 From: Shahms King Date: May 10 2006 22:40:38 +0000 Subject: update to new upstream version --- diff --git a/.cvsignore b/.cvsignore index 7087b3c..7262112 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bzr-0.7.tar.gz +bzr-0.8.tar.gz diff --git a/bzr-sys-etree.patch b/bzr-sys-etree.patch index 6449e2c..47a028b 100644 --- a/bzr-sys-etree.patch +++ b/bzr-sys-etree.patch @@ -1,6 +1,6 @@ -diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py ---- bzr-0.7.orig/bzrlib/xml.py 2006-01-23 01:33:08.000000000 -0800 -+++ bzr-0.7/bzrlib/xml.py 2006-02-10 09:37:34.000000000 -0800 +diff -ru bzr-0.8.orig/bzrlib/xml_serializer.py bzr-0.8/bzrlib/xml_serializer.py +--- bzr-0.8.orig/bzrlib/xml_serializer.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/bzrlib/xml_serializer.py 2006-05-10 15:19:46.000000000 -0700 @@ -30,9 +30,9 @@ except ImportError: mutter('WARNING: using slower ElementTree; consider installing cElementTree' @@ -14,11 +14,11 @@ diff -ur bzr-0.7.orig/bzrlib/xml.py bzr-0.7/bzrlib/xml.py from bzrlib.errors import BzrError -diff -ur bzr-0.7.orig/setup.py bzr-0.7/setup.py ---- bzr-0.7.orig/setup.py 2006-01-23 01:33:09.000000000 -0800 -+++ bzr-0.7/setup.py 2006-02-10 09:36:39.000000000 -0800 -@@ -96,7 +96,6 @@ - 'bzrlib.transport', +diff -ru bzr-0.8.orig/setup.py bzr-0.8/setup.py +--- bzr-0.8.orig/setup.py 2006-05-07 21:17:16.000000000 -0700 ++++ bzr-0.8/setup.py 2006-05-10 15:20:04.000000000 -0700 +@@ -108,7 +108,6 @@ + 'bzrlib.transport.http', 'bzrlib.ui', 'bzrlib.util', - 'bzrlib.util.elementtree', diff --git a/bzr.spec b/bzr.spec index 465e922..37e9b30 100644 --- a/bzr.spec +++ b/bzr.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: bzr -Version: 0.7 -Release: 3%{dist} +Version: 0.8 +Release: 1%{dist} Summary: Friendly distributed version control system Group: Development/Tools @@ -51,6 +51,16 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/bzrlib/*.pyc %ghost %{python_sitelib}/bzrlib/*.pyo +%dir %{python_sitelib}/bzrlib/doc +%{python_sitelib}/bzrlib/doc/*.py +%{python_sitelib}/bzrlib/doc/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/*.pyo + +%dir %{python_sitelib}/bzrlib/doc/api +%{python_sitelib}/bzrlib/doc/api/*.py +%{python_sitelib}/bzrlib/doc/api/*.pyc +%ghost %{python_sitelib}/bzrlib/doc/api/*.pyo + %dir %{python_sitelib}/bzrlib/export %{python_sitelib}/bzrlib/export/*.py %{python_sitelib}/bzrlib/export/*.pyc @@ -81,15 +91,20 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/bzrlib/store/*.pyc %ghost %{python_sitelib}/bzrlib/store/*.pyo -%dir %{python_sitelib}/bzrlib/tests -%{python_sitelib}/bzrlib/tests/*.py -%{python_sitelib}/bzrlib/tests/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/*.pyo +%dir %{python_sitelib}/bzrlib/store/revision +%{python_sitelib}/bzrlib/store/revision/*.py +%{python_sitelib}/bzrlib/store/revision/*.pyc +%ghost %{python_sitelib}/bzrlib/store/revision/*.pyo -%dir %{python_sitelib}/bzrlib/tests/blackbox -%{python_sitelib}/bzrlib/tests/blackbox/*.py -%{python_sitelib}/bzrlib/tests/blackbox/*.pyc -%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo +%dir %{python_sitelib}/bzrlib/store/versioned +%{python_sitelib}/bzrlib/store/versioned/*.py +%{python_sitelib}/bzrlib/store/versioned/*.pyc +%ghost %{python_sitelib}/bzrlib/store/versioned/*.pyo + +%dir %{python_sitelib}/bzrlib/transport/http +%{python_sitelib}/bzrlib/transport/http/*.py +%{python_sitelib}/bzrlib/transport/http/*.pyc +%ghost %{python_sitelib}/bzrlib/transport/http/*.pyo %dir %{python_sitelib}/bzrlib/ui %{python_sitelib}/bzrlib/ui/*.py @@ -101,7 +116,56 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/bzrlib/util/effbot/org/*.pyc %ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo +%dir %{python_sitelib}/bzrlib/tests +%{python_sitelib}/bzrlib/tests/*.py +%{python_sitelib}/bzrlib/tests/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/blackbox +%{python_sitelib}/bzrlib/tests/blackbox/*.py +%{python_sitelib}/bzrlib/tests/blackbox/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/blackbox/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/branch_implementations +%{python_sitelib}/bzrlib/tests/branch_implementations/*.py +%{python_sitelib}/bzrlib/tests/branch_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/branch_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/bzrdir_implementations +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.py +%{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/bzrdir_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interrepository_implementations +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.py +%{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interrepository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/interversionedfile_implementations +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.py +%{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/interversionedfile_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/repository_implementations +%{python_sitelib}/bzrlib/tests/repository_implementations/*.py +%{python_sitelib}/bzrlib/tests/repository_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/repository_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/revisionstore_implementations +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.py +%{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/revisionstore_implementations/*.pyo + +%dir %{python_sitelib}/bzrlib/tests/workingtree_implementations +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.py +%{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyc +%ghost %{python_sitelib}/bzrlib/tests/workingtree_implementations/*.pyo + %changelog +* Wed May 10 2006 Shahms E. King 0.8-1 +- Update to new upstream version +- Update bzr-sys-etree.patch for changes + * Mon Feb 13 2006 Shahms E. King 0.7-3 - Add python-elementtree to BuildRequires diff --git a/sources b/sources index 6bcb5ba..af43214 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5daf99b67478027ed0914edf32997181 bzr-0.7.tar.gz +88ccc545c202701544c4e039d373a48a bzr-0.8.tar.gz