From 9ae8bf6adc73188dccf288fdeff12a64cc94e8ba Mon Sep 17 00:00:00 2001
From: Toshio くらとみ <toshio@fedoraproject.org>
Date: Jan 22 2008 20:18:07 +0000
Subject: - Upstream 1.1 bugfix and performance enhancement release.

- Enable bash completion script from the contrib directory.

---

diff --git a/.cvsignore b/.cvsignore
index 74271c4..2305ec8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bzr-1.0.tar.gz
+bzr-1.1.tar.gz
diff --git a/bzr.spec b/bzr.spec
index 15e4b8e..56b163e 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           bzr
-Version:        1.0
+Version:        1.1
 Release:        1%{?dist}
 Summary:        Friendly distributed version control system
 
@@ -32,6 +32,9 @@ a user-friendly reimplementation of GNU Arch.
 %prep
 %setup -q
 
+sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
+sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/weave.py
+
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
@@ -39,8 +42,13 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --install-data %{_datadir} --root $RPM_BUILD_ROOT
+chmod 0644 contrib/bzr_access
 chmod 0755 $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/*.so
 
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
+install -m 0644 contrib/bash/bzr $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/
+rm contrib/bash/bzr
+
 # This is included in %doc, remove redundancy here
 #rm -rf $RPM_BUILD_ROOT%{python_sitearch}/bzrlib/doc/
 
@@ -56,13 +64,18 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README TODO COPYING.txt doc/  contrib/
 %{_bindir}/bzr
 %{_mandir}/man1/*
-
 %{python_sitearch}/bzrlib/
+%{_sysconfdir}/bash_completion.d/
+
 %if 0%{?fedora} > 8
 %{python_sitearch}/*.egg-info
 %endif
 
 %changelog
+* Mon Jan 21 2008 Toshio Kuratomi <a.badger@gmail.com> - 1.1-1
+- Upstream 1.1 bugfix and performance enhancement release.
+- Enable bash completion script from the contrib directory.
+
 * Thu Dec 13 2007 Toshio Kuratomi <a.badger@gmail.com> - 1.0-1
 - Update to 1.0 final.
 
diff --git a/sources b/sources
index 9d0faa6..afde3d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b71c7920a157bb508284ad77abcedf94  bzr-1.0.tar.gz
+10e9aed1c63227a5cb12f00b03d4ac37  bzr-1.1.tar.gz