[devassistant] Update to 0.5.0.

[Bohuslav Kabrda]

commit b50826d94a84b7b2197dfaa8b38d55aee491f6ea
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jul 29 11:52:09 2013 +0200

    Update to 0.5.0.
    
    - Regenerated patch0.

 devassistant-0.2.0-alter-paths-for-fedora.patch |   39 -----------------------
 devassistant-0.5.0-alter-paths-for-fedora.patch |   12 +++++++
 devassistant.spec                               |   38 +++++++++++++++-------
 3 files changed, 38 insertions(+), 51 deletions(-)
---
diff --git a/devassistant-0.5.0-alter-paths-for-fedora.patch b/devassistant-0.5.0-alter-paths-for-fedora.patch
new file mode 100644
index 0000000..cf8fd23
--- /dev/null
+++ b/devassistant-0.5.0-alter-paths-for-fedora.patch
@@ -0,0 +1,12 @@
+diff --git a/devassistant/settings.py b/devassistant/settings.py
+index 69aa333..01c2940 100644
+--- a/devassistant/settings.py
++++ b/devassistant/settings.py
+@@ -12,6 +12,6 @@ SUBASSISTANT_PREFIX = 'subassistant'
+ SUBASSISTANT_N_STRING = 'subassistant_{0}'
+ UI_FLAG = '--ui'
+ DEPS_ONLY_FLAG = '--deps-only'
+-YAML_DIRECTORIES = [os.path.join(os.path.dirname(__file__), 'yaml'),
++YAML_DIRECTORIES = ["_DATADIR_DEVASSISTANT",
+                     '/usr/local/share/devassistant',
+                     os.path.expanduser('~/.devassistant')]
diff --git a/devassistant.spec b/devassistant.spec
index 352c16e..5f32d0a 100644
--- a/devassistant.spec
+++ b/devassistant.spec
@@ -1,13 +1,14 @@
+%global shortname da
+
 Name:           devassistant
-Version:        0.4.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        1%{?dist}
 Summary:        Developer tool for setting up projects quickly
 
 License:        GPLv2+
 URL:            https://github.com/bkabrda/devassistant
 Source0:        https://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
-Patch0:         devassistant-0.2.0-alter-paths-for-fedora.patch
-Patch1:         devassistant-0.4.0-fix-manpage-typo.patch
+Patch0:         devassistant-0.5.0-alter-paths-for-fedora.patch
 BuildArch:      noarch
  
 BuildRequires:  pytest
@@ -25,7 +26,7 @@ Requires:       python-setuptools
 Requires:       PyYAML
 Requires:       zenity
 
-%global __requires_exclude ^/usr/bin/php$
+%global __requires_exclude ^\(/usr/bin/php\|/usr/bin/perl\|perl\\(\)
 
 %description
 Developer assistant is a tool for all developers using (not-only) Fedora.
@@ -38,31 +39,34 @@ installing dependencies.
 # Remove bundled egg-info
 rm -rf %{name}.egg-info
 
-%patch1 -p1
-
 %build
 %{__python} setup.py build
 
 %install
 %{__python} setup.py install --skip-build --root %{buildroot}
 
+# install manpages for both short and long forms of the binaries
 mkdir -p %{buildroot}%{_mandir}/man1
+install manpages/%{shortname}.1 %{buildroot}%{_mandir}/man1
+install manpages/%{shortname}-mod.1 %{buildroot}%{_mandir}/man1
+install manpages/%{shortname}-prep.1 %{buildroot}%{_mandir}/man1
 install manpages/%{name}.1 %{buildroot}%{_mandir}/man1
 install manpages/%{name}-modify.1 %{buildroot}%{_mandir}/man1
 install manpages/%{name}-prepare.1 %{buildroot}%{_mandir}/man1
+# bash completion script (only for "da" binary so far)
 mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
-install %{name}.bash %{buildroot}%{_sysconfdir}/bash_completion.d/
+install %{shortname}.bash %{buildroot}%{_sysconfdir}/bash_completion.d/
 
 ## move assistants, snippets and templates into %%{_datadir}
 # first, do the alterations to paths in devassistant
 pushd %{buildroot}%{python_sitelib}
 patch -p1 < %{PATCH0}
-find . -name '*.py' -exec sed -i 's|_DATADIR_DEVASSISTANT|%{_datadir}/%{name}|' {} \;
+sed -i 's|_DATADIR_DEVASSISTANT|%{_datadir}/%{name}|' devassistant/settings.py
 popd
 # now actually move the stuff
-mkdir -p %{buildroot}%{_datadir}/%{name}/assistants
-mv %{buildroot}%{python_sitelib}/%{name}/assistants/assistants %{buildroot}%{_datadir}/%{name}/assistants
-mv %{buildroot}%{python_sitelib}/%{name}/assistants/snippets %{buildroot}%{_datadir}/%{name}/assistants
+mkdir -p %{buildroot}%{_datadir}/%{name}/
+mv %{buildroot}%{python_sitelib}/%{name}/yaml/assistants %{buildroot}%{_datadir}/%{name}/assistants
+mv %{buildroot}%{python_sitelib}/%{name}/yaml/snippets %{buildroot}%{_datadir}/%{name}/snippets
 mv %{buildroot}%{python_sitelib}/%{name}/templates %{buildroot}%{_datadir}/%{name}
 
 %check
@@ -70,10 +74,16 @@ mv %{buildroot}%{python_sitelib}/%{name}/templates %{buildroot}%{_datadir}/%{nam
 
 %files
 %doc README.rst LICENSE
+%{_bindir}/%{shortname}
+%{_bindir}/%{shortname}-mod
+%{_bindir}/%{shortname}-prep
 %{_bindir}/%{name}
 %{_bindir}/%{name}-modify
 %{_bindir}/%{name}-prepare
 %{_datadir}/%{name}
+%{_mandir}/man1/%{shortname}.1.gz
+%{_mandir}/man1/%{shortname}-mod.1.gz
+%{_mandir}/man1/%{shortname}-prep.1.gz
 %{_mandir}/man1/%{name}.1.gz
 %{_mandir}/man1/%{name}-modify.1.gz
 %{_mandir}/man1/%{name}-prepare.1.gz
@@ -82,6 +92,10 @@ mv %{buildroot}%{python_sitelib}/%{name}/templates %{buildroot}%{_datadir}/%{nam
 %{python_sitelib}/%{name}-%{version}-py?.?.egg-info
 
 %changelog
+* Fri Jul 26 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 0.5.0-1
+- Update to 0.5.0.
+- Regenerated patch0.
+
 * Wed Jul 17 2013 Petr Pisar <ppisar at redhat.com> - 0.4.0-3
 - Perl 5.18 rebuild