[devassistant] Update to devassistant 0.2.0.
Bohuslav Kabrda
bkabrda at fedoraproject.org
Mon Mar 18 13:39:20 UTC 2013
commit dd03935320082b982716ae174b5f1dc53d0a2db8
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Mon Mar 18 14:39:14 2013 +0100
Update to devassistant 0.2.0.
- Move assistants and snippets to %{datadir}/%{name}.
- Introduce manpage.
.gitignore | 1 +
devassistant-0.2.0-alter-paths-for-fedora.patch | 39 +++++++++++++++++++++++
devassistant.spec | 34 ++++++++++++++-----
sources | 2 +-
4 files changed, 66 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f11642..f5c144c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/devassistant-0.1.0.tar.gz
+/devassistant-0.2.0.tar.gz
diff --git a/devassistant-0.2.0-alter-paths-for-fedora.patch b/devassistant-0.2.0-alter-paths-for-fedora.patch
new file mode 100644
index 0000000..3f766a3
--- /dev/null
+++ b/devassistant-0.2.0-alter-paths-for-fedora.patch
@@ -0,0 +1,39 @@
+diff --git a/devassistant/assistant_base.py b/devassistant/assistant_base.py
+index 6131e9c..b5c91f1 100644
+--- a/devassistant/assistant_base.py
++++ b/devassistant/assistant_base.py
+@@ -24,7 +24,7 @@ class AssistantBase(object):
+ args = []
+ repo = []
+
+- template_dir = os.path.join(os.path.dirname(__file__), 'templates')
++ template_dir = os.path.join('_DATADIR_DEVASSISTANT', 'templates')
+
+ # don't override these, used internally
+ _dot_devassistant_path = None
+diff --git a/devassistant/yaml_assistant_loader.py b/devassistant/yaml_assistant_loader.py
+index 7221cd0..496c173 100644
+--- a/devassistant/yaml_assistant_loader.py
++++ b/devassistant/yaml_assistant_loader.py
+@@ -7,7 +7,7 @@ from devassistant import yaml_snippet_loader
+ from devassistant.assistants import yaml_assistant
+
+ class YamlAssistantLoader(object):
+- assistants_dirs = [os.path.join(os.path.dirname(__file__), 'assistants', 'yaml')]
++ assistants_dirs = [os.path.join('_DATADIR_DEVASSISTANT', 'assistants', 'yaml')]
+ _classes = []
+
+ @classmethod
+diff --git a/devassistant/yaml_snippet_loader.py b/devassistant/yaml_snippet_loader.py
+index b9b8a22..c1c9424 100644
+--- a/devassistant/yaml_snippet_loader.py
++++ b/devassistant/yaml_snippet_loader.py
+@@ -6,7 +6,7 @@ from devassistant import yaml_loader
+ from devassistant.assistants import snippet
+
+ class YamlSnippetLoader(object):
+- snippets_dirs = [os.path.join(os.path.dirname(__file__), 'assistants', 'snippets')]
++ snippets_dirs = [os.path.join('_DATADIR_DEVASSISTANT', 'assistants', 'snippets')]
+ _snippets = []
+
+ @classmethod
diff --git a/devassistant.spec b/devassistant.spec
index 6fc55e0..eceacbb 100644
--- a/devassistant.spec
+++ b/devassistant.spec
@@ -1,11 +1,12 @@
Name: devassistant
-Version: 0.1.0
-Release: 3%{?dist}
+Version: 0.2.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
BuildArch: noarch
BuildRequires: pytest
@@ -13,14 +14,11 @@ BuildRequires: python2-devel
BuildRequires: python-flexmock
BuildRequires: python-setuptools
-BuildRequires: git
BuildRequires: python-github
BuildRequires: python-jinja2
BuildRequires: python-plumbum
BuildRequires: PyYAML
-# just have to be there, not actually used
BuildRequires: sudo
-BuildRequires: yum
Requires: git
Requires: python-github
@@ -28,6 +26,8 @@ Requires: python-jinja2
Requires: python-plumbum
Requires: python-setuptools
Requires: PyYAML
+Requires: sudo
+Requires: yum
%description
Developer assistant is a tool for all developers using (not-only) Fedora.
@@ -45,11 +45,21 @@ rm -rf %{name}.egg-info
%install
%{__python} setup.py install --skip-build --root %{buildroot}
-# move templates dir to %%{_datadir}
-mkdir -p %{buildroot}%{_datadir}/%{name}
+
+mkdir -p %{buildroot}%{_mandir}/man1
+install %{name}.1.gz %{buildroot}%{_mandir}/man1
+
+## 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}|' {} \;
+popd
+# now actually move the stuff
+mkdir -p %{buildroot}%{_datadir}/%{name}/assistants
+mv %{buildroot}%{python_sitelib}/%{name}/assistants/yaml %{buildroot}%{_datadir}/%{name}/assistants
+mv %{buildroot}%{python_sitelib}/%{name}/assistants/snippets %{buildroot}%{_datadir}/%{name}/assistants
mv %{buildroot}%{python_sitelib}/%{name}/templates %{buildroot}%{_datadir}/%{name}
-sed -i 's|template_dir = .*|template_dir = "%{_datadir}/%{name}/templates"\n|' \
- %{buildroot}%{python_sitelib}/%{name}/assistant_base.py
%check
%{__python} setup.py test -t py.test
@@ -58,10 +68,16 @@ sed -i 's|template_dir = .*|template_dir = "%{_datadir}/%{name}/templates"\n|' \
%doc README.rst LICENSE
%{_bindir}/%{name}
%{_datadir}/%{name}
+%{_mandir}/man1/%{name}.1.gz
%{python_sitelib}/%{name}
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
%changelog
+* Mon Mar 18 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 0.2.0-1
+- Update to devassistant 0.2.0.
+- Move assistants and snippets to %%{datadir}/%%{name}.
+- Introduce manpage.
+
* Tue Mar 12 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 0.1.0-3
- Move templates to %%{_datadir}.
diff --git a/sources b/sources
index 61978cb..b53d3e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-48aeb97db6d0f767f30afe8b60ac9b25 devassistant-0.1.0.tar.gz
+4036530684d8eb27db78f11feb923f5e devassistant-0.2.0.tar.gz
More information about the scm-commits
mailing list