[stgit] Resolves: rhbz#530877 bump stgit to 0.15

[Caolán McNamara]

commit 560fb346af37e3e1c8ffa5c99e8537b2340ba105
Author: Todd Zullinger <tmz at pobox.com>
Date:   Tue Dec 6 13:17:50 2011 +0000

    Resolves: rhbz#530877 bump stgit to 0.15

 .gitignore |    2 +-
 sources    |    2 +-
 stgit.spec |   35 ++++++++++++++++++++++++++---------
 3 files changed, 28 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b1bfb3..4d3ed7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-stgit-0.14.3.tar.gz
+/stgit-0.15.tar.gz
diff --git a/sources b/sources
index f35f898..46a0980 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-84447155c0a86fae795928a581dc22bd  stgit-0.14.3.tar.gz
+a4721b2a5f529cf5450109f9fcb4db19  stgit-0.15.tar.gz
diff --git a/stgit.spec b/stgit.spec
index d90778e..a209c26 100644
--- a/stgit.spec
+++ b/stgit.spec
@@ -2,14 +2,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           stgit
-Version:        0.14.3
-Release:        8%{?dist}
+Version:        0.15
+Release:        1%{?dist}
 Summary:        Patch stack for Git repositories
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.procode.org/stgit
-Source0:        http://homepage.ntlworld.com/cmarinas/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://download.gna.org/stgit/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -35,16 +35,28 @@ StGIT commands.
 %prep
 %setup -q
 
+# Fix some badly encoded characters in the ChangeLog file
+sed 's/\xf6/\xc3\xb6/g;s/\xe4/\xc3\xa4/g;s/\\\\\xc3\\\\\xb6/\xc3\xb6/g' \
+    ChangeLog > ChangeLog.utf8
+touch -r ChangeLog ChangeLog.utf8
+mv ChangeLog.utf8 ChangeLog
+
 
 %build
-%{__python} setup.py build
+make prefix=%{_prefix}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --prefix %{_prefix} --root $RPM_BUILD_ROOT
 chmod -x $RPM_BUILD_ROOT%{_datadir}/stgit/contrib/stgbashprompt.sh
- 
+
+# Install bash completion
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+ln -sv ../..%{_datadir}/%{name}/completion/stgit-completion.bash \
+    $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/%{name}
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -52,15 +64,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
-
 %{_bindir}/stg
-
-# For noarch packages: sitelib
+%{_sysconfdir}/bash_completion.d
 %{python_sitelib}/*
 %{_datadir}/stgit
 
 
 %changelog
+* Tue Dec 06 2011 Todd Zullinger <tmz at pobox.com> - 0.15-1
+- Update to 0.15
+- Fix Source URL
+- Fix some badly encoded characters in the ChangeLog file
+- Use upstream Makefile to build so bash-completion script is built
+- Install bash-completion script in %%{_sysconfdir}/bash_completion.d
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.14.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild