- remove elementree copy

[packages/bzr.git] / bzr.spec

diff --git a/bzr.spec b/bzr.spec
index 953fd3d852af491584209b70eeb9d0b9101c1af8..4e02585cc0fac9a48c380b882d0eafdec29c92f6 100644 (file)
--- a/bzr.spec
+++ b/bzr.spec
@@ -1,20 +1,24 @@
 Summary:       Bazaar - a distributed revision control system
 Summary(pl.UTF-8):     Bazaar - rozproszony system kontroli wersji
 Name:          bzr
-Version:       1.12
-Release:       1
+Version:       2.2.1
+Release:       3
 License:       GPL v2
 Group:         Development/Version Control
-Source0:       https://launchpad.net/bzr/1.12/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5: 331ceefccbe39ddff610a1a847bd611a
-URL:           http://bazaar-vcs.org/
-BuildRequires: python >= 1:2.5
+Source0:       http://launchpad.net/bzr/2.2/%{version}/+download/%{name}-%{version}.tar.gz
+# Source0-md5: 8a6abd8f888fb3e0845e2044d41a24bc
+# from https://bugs.launchpad.net/bzr/+bug/612096
+Patch0:                py27.patch
+URL:           http://bazaar.canonical.com/
+BuildRequires: python >= 1:2.4
+BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
+BuildRequires: zlib-devel
 %pyrequires_eq  python
+Requires:      python-cElementTree
 # pdb module required by bzr
 Requires:      python-devel-tools
-Requires:      python-cElementTree
 Requires:      python-paramiko
 Requires:      python-pycurl
 Obsoletes:     bazaar
@@ -61,15 +65,27 @@ Dodatkowe możliwości takie jak: cherry picking, obsługa innych
 systemów kontroli wersji, GUI są dostępne poprzez dodatkowe pakiety
 rozszerzeń.
 
+%package -n bash-completion-%{name}
+Summary:       bash-completion for bzr
+Group:         Applications/Shells
+Requires:      %{name} = %{version}-%{release}
+Requires:      bash-completion
+
+%description -n bash-completion-%{name}
+This package provides bash-completion for bzr.
+
 %prep
 %setup -q
+%patch0 -p0
+
+# move out of contrib, as we package contrib as doc
+mv contrib/bash/bzr bash_completion.sh
 
 %build
 %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %{__python} setup.py install \
        --optimize=2 \
        --install-data %{_datadir} \
@@ -77,13 +93,34 @@ rm -rf $RPM_BUILD_ROOT
 
 %py_postclean
 
+# bash-completion
+install -d $RPM_BUILD_ROOT/etc/bash_completion.d
+install -p bash_completion.sh $RPM_BUILD_ROOT/etc/bash_completion.d/%{name}
+
+# Use independently packaged python-elementtree instead
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/util/elementtree
+
+# don't package tests
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/bash_completion/tests
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/launchpad/test_*.py*
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/netrc_credential_store/tests
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/plugins/news_merge/tests
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/tests
+rm -rf $RPM_BUILD_ROOT%{py_sitedir}/bzrlib/util/tests
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/*.txt NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
+%doc doc/*.txt NEWS README TODO contrib
+%attr(755,root,root) %{_bindir}/bzr
 %{_mandir}/man1/bzr.1*
 %{py_sitedir}/bzrlib
+%if "%{py_ver}" > "2.4"
 %{py_sitedir}/*.egg-info
+%endif
+
+%files -n bash-completion-%{name}
+%defattr(644,root,root,755)
+/etc/bash_completion.d/%{name}