rpms/bzr/devel bzr-sys-etree.patch, NONE, 1.1 bzr.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Shahms King (shahms)]

Author: shahms

Update of /cvs/extras/rpms/bzr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11752/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bzr-sys-etree.patch bzr.spec 
Log Message:
auto-import bzr-0.7-1 on branch devel from bzr-0.7-1.src.rpm

bzr-sys-etree.patch:

--- NEW FILE bzr-sys-etree.patch ---
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
@@ -30,9 +30,9 @@
 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,
-                                              Element, XMLTreeBuilder,
-                                              fromstring, tostring)
+    from elementtree.ElementTree import (ElementTree, SubElement,
+                                         Element, XMLTreeBuilder,
+                                         fromstring, tostring)
 
 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',
                 'bzrlib.ui',
                 'bzrlib.util',
-                'bzrlib.util.elementtree',
                 'bzrlib.util.effbot.org',
                 'bzrlib.util.configobj',
                 ],


--- NEW FILE bzr.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           bzr
Version:        0.7
Release:        1
Summary:        Friendly distributed version control system

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
BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires:   python-elementtree

%description
Bazaar-NG is a distributed revision control system that is powerful, friendly,
and scalable. It is the successor of the bazaar RCS which, in turn, was
a user-friendly reimplementation of GNU Arch.


%prep
%setup -q
%patch0 -p1

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT

 
%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc HACKING NEWS README NEWS.developers TODO doc/
%{_bindir}/bzr
%{_mandir}/man1/*

%dir %{python_sitelib}/bzrlib
%{python_sitelib}/bzrlib/*.py
%{python_sitelib}/bzrlib/*.pyc
%ghost %{python_sitelib}/bzrlib/*.pyo

%dir %{python_sitelib}/bzrlib/export
%{python_sitelib}/bzrlib/export/*.py
%{python_sitelib}/bzrlib/export/*.pyc
%ghost %{python_sitelib}/bzrlib/export/*.pyo

%dir %{python_sitelib}/bzrlib/plugins
%{python_sitelib}/bzrlib/plugins/*.py
%{python_sitelib}/bzrlib/plugins/*.pyc
%ghost %{python_sitelib}/bzrlib/plugins/*.pyo

%dir %{python_sitelib}/bzrlib/util
%{python_sitelib}/bzrlib/util/*.py
%{python_sitelib}/bzrlib/util/*.pyc
%ghost %{python_sitelib}/bzrlib/util/*.pyo

%dir %{python_sitelib}/bzrlib/util/configobj
%{python_sitelib}/bzrlib/util/configobj/*.py
%{python_sitelib}/bzrlib/util/configobj/*.pyc
%ghost %{python_sitelib}/bzrlib/util/configobj/*.pyo

%dir %{python_sitelib}/bzrlib/transport
%{python_sitelib}/bzrlib/transport/*.py
%{python_sitelib}/bzrlib/transport/*.pyc
%ghost %{python_sitelib}/bzrlib/transport/*.pyo

%dir %{python_sitelib}/bzrlib/store
%{python_sitelib}/bzrlib/store/*.py
%{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/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/ui
%{python_sitelib}/bzrlib/ui/*.py
%{python_sitelib}/bzrlib/ui/*.pyc
%ghost %{python_sitelib}/bzrlib/ui/*.pyo

%dir %{python_sitelib}/bzrlib/util/effbot/org
%{python_sitelib}/bzrlib/util/effbot/org/*.py
%{python_sitelib}/bzrlib/util/effbot/org/*.pyc
%ghost %{python_sitelib}/bzrlib/util/effbot/org/*.pyo

%changelog
* Fri Feb 10 2006 Shahms E. King <shahms at shahms.com> 0.7-1
- Update to 0.7

* Thu Jan 26 2006 Shahms E. King <shahms at shahms.com> 0.6.2-2
- Fix system library patch

* Wed Dec 07 2005 Shahms E. King <shahms at shahms.com> 0.6.2-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Feb 2006 18:59:51 -0000	1.1
+++ .cvsignore	10 Feb 2006 19:00:25 -0000	1.2
@@ -0,0 +1 @@
+bzr-0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bzr/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Feb 2006 18:59:51 -0000	1.1
+++ sources	10 Feb 2006 19:00:25 -0000	1.2
@@ -0,0 +1 @@
+5daf99b67478027ed0914edf32997181  bzr-0.7.tar.gz