From 831dd192f842aac7870e17cd0430147048ed8e3d Mon Sep 17 00:00:00 2001
From: Rich Mattes <richmattes@gmail.com>
Date: Sep 14 2015 00:45:04 +0000
Subject: Update to release 0.1.9 (rhbz#1261684)


---

diff --git a/.gitignore b/.gitignore
index 8005de4..a29fbe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /wstool-0.1.4-f6f7ad0.tar.gz
 /wstool-0.1.5-8b280d4.tar.gz
 /wstool-928d01b227d4e8a204765eab14541a8ca852e125.tar.gz
+/wstool-e1d99741a38aebaf63f358b68aa597d61dc87cc5.tar.gz
diff --git a/python-wstool.spec b/python-wstool.spec
index d520782..928881a 100644
--- a/python-wstool.spec
+++ b/python-wstool.spec
@@ -1,4 +1,4 @@
-%global commit 928d01b227d4e8a204765eab14541a8ca852e125
+%global commit e1d99741a38aebaf63f358b68aa597d61dc87cc5
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 %global module_name wstool
 
@@ -10,13 +10,15 @@
 %endif
 
 Name:           python-%{module_name}
-Version:        0.1.6
-Release:        2%{?dist}
+Version:        0.1.9
+Release:        1%{?dist}
 Summary:        Tool for managing a workspace of multiple heterogeneous SCM repositories
 
 License:        BSD
 URL:            http://www.ros.org/wiki/%{module_name}
 Source0:        https://github.com/vcstools/%{module_name}/archive/%{commit}/%{module_name}-%{commit}.tar.gz
+# Patch to remove a duplicate installed file.  Not submitted upstream
+Patch0:         %{module_name}-0.1.9-fedora.patch
 
 BuildArch:      noarch
 
@@ -30,7 +32,7 @@ BuildRequires:  python-mock
 BuildRequires:  python-nose
 BuildRequires:  python-rosinstall
 BuildRequires:  python-setuptools
-BuildRequires:  python-vcstools >= 0.1.34
+BuildRequires:  python-vcstools >= 0.1.37
 BuildRequires:  PyYAML
 BuildRequires:  subversion
 
@@ -39,7 +41,7 @@ Requires:       git
 Requires:       mercurial
 Requires:       python-dateutil
 Requires:       python-rosinstall
-Requires:       python-vcstools >= 0.1.34
+Requires:       python-vcstools >= 0.1.37
 Requires:       PyYAML
 Requires:       subversion
 
@@ -91,6 +93,7 @@ other respects, it behaves the same as rosws.
 
 %prep
 %setup -qn %{module_name}-%{commit}
+%patch0 -p0 -b .fedora
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -108,11 +111,11 @@ popd
 %endif # with_python3
 
 %install
-%{__python2} setup.py install --skip-build --root %{buildroot}
+%{__python2} setup.py install --skip-build --root %{buildroot} --prefix %{_usr}
 
 %if 0%{?with_python3}
 pushd %{py3dir}
-%{__python3} setup.py install --skip-build --root %{buildroot}
+%{__python3} setup.py install --skip-build --root %{buildroot} --prefix %{_usr}
 popd
 %endif # with_python3
 
@@ -136,6 +139,14 @@ popd
 %{_bindir}/%{module_name}
 %{python_sitelib}/%{module_name}/
 %{python_sitelib}/%{module_name}-%{version}-py?.?.egg-info/
+%{_mandir}/man1/*.1.*
+# bash completion
+%config(noreplace) %{_sysconfdir}/bash_completion.d/*
+# zsh completion
+%dir %{_datadir}/zsh/
+%dir %{_datadir}/zsh/site-functions/
+%{_datadir}/zsh/site-functions/_wstool
+
 
 %if 0%{?with_python3}
 %files -n python3-%{module_name}
@@ -146,6 +157,9 @@ popd
 %endif # with_python3
 
 %changelog
+* Sun Sep 13 2015 Rich Mattes <richmattes@gmail.com> - 0.1.9-1
+- Update to release 0.1.9 (rhbz#1261684)
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index b9ae247..6e307d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c7d96e5171d724616de5ee06d4b41e8  wstool-928d01b227d4e8a204765eab14541a8ca852e125.tar.gz
+3f25b3a840551361c9360c5054acd1e5  wstool-e1d99741a38aebaf63f358b68aa597d61dc87cc5.tar.gz
diff --git a/wstool-0.1.9-fedora.patch b/wstool-0.1.9-fedora.patch
new file mode 100644
index 0000000..397718d
--- /dev/null
+++ b/wstool-0.1.9-fedora.patch
@@ -0,0 +1,25 @@
+diff -up ./completion/_wstool.fedora ./completion/_wstool
+--- ./completion/_wstool.fedora	2015-09-11 09:44:12.000000000 -0400
++++ ./completion/_wstool	2015-09-13 20:23:44.033390649 -0400
+@@ -33,7 +33,7 @@
+ 
+ _wstool () {
+   local e
+-  e=$(dirname ${funcsourcetrace[1]%:*})/wstool-completion.bash
++  e=/etc/bash_profile.d/wstool-completion.bash
+   if [ -f $e ]; then
+     . $e
+   fi
+diff -up ./setup.py.fedora ./setup.py
+--- ./setup.py.fedora	2015-09-11 09:44:12.000000000 -0400
++++ ./setup.py	2015-09-13 20:28:59.620945591 -0400
+@@ -47,8 +47,7 @@ def get_data_files(prefix):
+     data_files.append((bash_comp_dest, ['completion/wstool-completion.bash']))
+     zsh_comp_dest = os.path.join(_resolve_prefix(prefix, 'zsh_comp'),
+                                  'share/zsh/site-functions')
+-    data_files.append((zsh_comp_dest, ['completion/_wstool',
+-                                       'completion/wstool-completion.bash']))
++    data_files.append((zsh_comp_dest, ['completion/_wstool']))
+     return data_files
+ 
+