[devassistant] Update to 0.6.1.
Bohuslav Kabrda
bkabrda at fedoraproject.org
Wed Aug 28 10:59:38 UTC 2013
commit 0fd8d5dcd1b06972aa4d74d3d86c3e02ce9dadb5
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date: Wed Aug 28 12:49:56 2013 +0200
Update to 0.6.1.
- Introduce gui, add its dependencies.
.gitignore | 1 +
devassistant-0.5.0-alter-paths-for-fedora.patch | 12 ------
devassistant-0.6.0-alter-paths-for-fedora.patch | 13 +++++++
devassistant.spec | 42 ++++++++++++++---------
sources | 2 +-
5 files changed, 41 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 84f7787..9398f73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/devassistant-0.3.1.tar.gz
/devassistant-0.4.0.tar.gz
/devassistant-0.5.0.tar.gz
+/devassistant-0.6.1.tar.gz
diff --git a/devassistant-0.6.0-alter-paths-for-fedora.patch b/devassistant-0.6.0-alter-paths-for-fedora.patch
new file mode 100644
index 0000000..f34a95c
--- /dev/null
+++ b/devassistant-0.6.0-alter-paths-for-fedora.patch
@@ -0,0 +1,13 @@
+diff --git a/devassistant/settings.py b/devassistant/settings.py
+index 2bf1f0f..f39054f 100644
+--- a/devassistant/settings.py
++++ b/devassistant/settings.py
+@@ -13,7 +13,7 @@ SUBASSISTANT_N_STRING = 'subassistant_{0}'
+ UI_FLAG = '--ui'
+ DEPS_ONLY_FLAG = '--deps-only'
+ CACHE_FILE = os.path.expanduser('~/.devassistant/.cache.yaml')
+-DATA_DIRECTORIES = [os.path.join(os.path.dirname(__file__), 'data'),
++DATA_DIRECTORIES = ["_DATADIR_DEVASSISTANT",
+ '/usr/local/share/devassistant',
+ os.path.expanduser('~/.devassistant')]
+ ASSISTANT_ROLES=['creator', 'modifier', 'preparer']
diff --git a/devassistant.spec b/devassistant.spec
index 6a42699..80eb1e8 100644
--- a/devassistant.spec
+++ b/devassistant.spec
@@ -1,14 +1,14 @@
%global shortname da
Name: devassistant
-Version: 0.5.0
-Release: 2%{?dist}
+Version: 0.6.1
+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.5.0-alter-paths-for-fedora.patch
+Patch0: devassistant-0.6.0-alter-paths-for-fedora.patch
BuildArch: noarch
BuildRequires: pytest
@@ -21,6 +21,8 @@ BuildRequires: PyYAML
# it seems that other packages using bash-completion don't depend
# on it and rather just own the directory, so we will do the same
Requires: git
+Requires: polkit
+Requires: pygobject3
Requires: python-PyGithub
Requires: python-setuptools
Requires: PyYAML
@@ -47,27 +49,30 @@ rm -rf %{name}.egg-info
# 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)
+install -p manpages/%{shortname}.1 %{buildroot}%{_mandir}/man1
+install -p manpages/%{shortname}-mod.1 %{buildroot}%{_mandir}/man1
+install -p manpages/%{shortname}-prep.1 %{buildroot}%{_mandir}/man1
+install -p manpages/%{name}.1 %{buildroot}%{_mandir}/man1
+install -p manpages/%{name}-modify.1 %{buildroot}%{_mandir}/man1
+install -p manpages/%{name}-prepare.1 %{buildroot}%{_mandir}/man1
+# bash completion script
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
-install %{shortname}.bash %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -p %{shortname}.bash %{buildroot}%{_sysconfdir}/bash_completion.d/
-## move assistants, snippets and templates into %%{_datadir}
+## move data (assistants, snippets, templates) into %%{_datadir}
# first, do the alterations to paths in devassistant
pushd %{buildroot}%{python_sitelib}
patch -p1 < %{PATCH0}
sed -i 's|_DATADIR_DEVASSISTANT|%{_datadir}/%{name}|' devassistant/settings.py
popd
# now actually move the stuff
-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}
+mv %{buildroot}%{python_sitelib}/%{name}/data %{buildroot}%{_datadir}/%{name}
+# remove git subproject files
+rm -rf %{buildroot}%{_datadir}/%{name}/.git*
+
+# make sure that we have all the essential dirs, if not created previously by copying
+mkdir -p %{buildroot}%{_datadir}/%{name}/{assistants/{creator/modifier/preparer},snippets,templates}
+mkdir -p %{buildroot}%{_prefix}/local/share/%{name}/{assistants/{creator/modifier/preparer},snippets,templates}
%check
%{__python} setup.py test -t py.test
@@ -77,6 +82,7 @@ mv %{buildroot}%{python_sitelib}/%{name}/templates %{buildroot}%{_datadir}/%{nam
%{_bindir}/%{shortname}
%{_bindir}/%{shortname}-mod
%{_bindir}/%{shortname}-prep
+%{_bindir}/%{shortname}-gui
%{_bindir}/%{name}
%{_bindir}/%{name}-modify
%{_bindir}/%{name}-prepare
@@ -92,6 +98,10 @@ mv %{buildroot}%{python_sitelib}/%{name}/templates %{buildroot}%{_datadir}/%{nam
%{python_sitelib}/%{name}-%{version}-py?.?.egg-info
%changelog
+* Wed Aug 28 2013 Bohuslav Kabrda <bkabrda at redhat.com> - 0.6.1-1
+- Update to 0.6.1.
+- Introduce gui, add its dependencies.
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 449ad41..a4ea02e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1fe4a7f92daa47d21a21a4367d9a3708 devassistant-0.5.0.tar.gz
+60ecef02c64366283371bce021917154 devassistant-0.6.1.tar.gz
More information about the scm-commits
mailing list