diff --git a/.devassist09-devassistant.metadata b/.devassist09-devassistant.metadata new file mode 100644 index 0000000..c5cf09b --- /dev/null +++ b/.devassist09-devassistant.metadata @@ -0,0 +1 @@ +a05e81e8029adedc17ca16d4e75a409e12ec09fc SOURCES/devassistant-0.9.1.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..be437fc --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/devassistant-0.9.1.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 98f42b4..0000000 --- a/README.md +++ /dev/null @@ -1,4 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/devassistant-0.9.0-alter-paths-downstream.patch b/SOURCES/devassistant-0.9.0-alter-paths-downstream.patch new file mode 100644 index 0000000..e3c0ad7 --- /dev/null +++ b/SOURCES/devassistant-0.9.0-alter-paths-downstream.patch @@ -0,0 +1,13 @@ +--- devassistant/settings.py.orig 2014-06-20 10:42:50.000000000 +0200 ++++ devassistant/settings.py 2014-06-23 14:21:15.671789766 +0200 +@@ -30,8 +30,8 @@ + CACHE_FILE = os.path.expanduser('~/.devassistant/.cache.yaml') + CONFIG_FILE = os.path.expanduser('~/.devassistant/.config') + LOG_FILE = os.path.expanduser('~/.devassistant/lastrun.log') +-DATA_DIRECTORIES = [os.path.join(os.path.dirname(__file__), 'data'), +- '/usr/local/share/devassistant', ++DATA_DIRECTORIES = ['_DATADIR_DEVASSISTANT', ++ '_DATADIR_LOCAL_DEVASSISTANT', + os.path.expanduser('~/.devassistant')] + if 'DEVASSISTANT_PATH' in os.environ: + DATA_DIRECTORIES = os.environ['DEVASSISTANT_PATH'].split(':') + DATA_DIRECTORIES diff --git a/SOURCES/devassistant-0.9.0-dont-require-pygithub.patch b/SOURCES/devassistant-0.9.0-dont-require-pygithub.patch new file mode 100644 index 0000000..47917c3 --- /dev/null +++ b/SOURCES/devassistant-0.9.0-dont-require-pygithub.patch @@ -0,0 +1,11 @@ +--- setup.py.orig 2014-06-23 14:07:01.732483012 +0200 ++++ setup.py 2014-06-23 14:08:35.870401969 +0200 +@@ -102,7 +102,7 @@ + 'devassistant=devassistant.cli.cli_runner:CliRunner.run', + 'devassistant-gui=devassistant.gui:run_gui']}, + # PyGithub is in fact optional, but let's keep it here +- install_requires=['PyYaml', 'PyGithub>=1.14.2', 'jinja2', 'progress', 'six'], ++ install_requires=['PyYaml', 'jinja2', 'progress', 'six'], + setup_requires = [], + classifiers = ['Development Status :: 4 - Beta', + 'Environment :: Console', diff --git a/SOURCES/devassistant-0.9.0-remove-creator-window.patch b/SOURCES/devassistant-0.9.0-remove-creator-window.patch new file mode 100644 index 0000000..4c746cd --- /dev/null +++ b/SOURCES/devassistant-0.9.0-remove-creator-window.patch @@ -0,0 +1,22 @@ +--- devassistant/gui/__init__.py.orig 2014-06-23 14:50:40.994456833 +0200 ++++ devassistant/gui/__init__.py 2014-06-23 14:50:48.954450792 +0200 +@@ -26,19 +26,3 @@ + sys.exit(1) + from devassistant.gui import main_window + main_window.MainWindow() +- +- +-def run_yaml_gui(): +- """ +- Function for running DevAssistant YAML Creator GUI +- """ +- try: +- from gi.repository import Gtk +- except RuntimeError as e: +- sys.stderr.write(GUI_MESSAGE) +- sys.stderr.write("%s: %r" % (e.__class__.__name__, str(e))) +- sys.stderr.flush() +- sys.exit(1) +- +- from devassistant.gui import creator_window +- creator_window.CreatorWindow() diff --git a/SPECS/devassistant.spec b/SPECS/devassistant.spec new file mode 100644 index 0000000..3899185 --- /dev/null +++ b/SPECS/devassistant.spec @@ -0,0 +1,206 @@ +%{?scl:%scl_package devassistant} +%{!?scl:%global pkg_name %{name}} + +%global shortname da + +#%%global prerel b1 + +Name: %{?scl_prefix}devassistant +Version: 0.9.1 +Release: %{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist} +Summary: DevAssistant - Making life easier for developers + +License: GPLv2+ and CC-BY-SA +URL: https://github.com/bkabrda/devassistant +Source0: https://pypi.python.org/packages/source/d/%{pkg_name}/%{pkg_name}-%{version}%{?prerel}.tar.gz +Patch0: %{pkg_name}-0.9.0-alter-paths-downstream.patch +Patch2: %{pkg_name}-0.9.0-dont-require-pygithub.patch +# Remove currently not finished functionality +Patch4: devassistant-0.9.0-remove-creator-window.patch +BuildArch: noarch + +BuildRequires: python-devel +BuildRequires: python-setuptools +BuildRequires: python-sphinx + +Requires: git +Requires: gtk3 +Requires: polkit +Requires: pygobject3 +Requires: python-argparse +Requires: python-setuptools +Requires: python-jinja2 +Requires: %{?scl_prefix}python-progress +Requires: python-six +Requires: PyYAML +Requires: yum +%{?scl:Requires: %{scl}-runtime} +%{?scl:BuildRequires: %{scl}-runtime} + +%description +DevAssistant can help you with creating and setting up basic projects +in various languages, installing dependencies, setting up environments, +working with source control, etc. + +%package doc +Summary: Documentation for %{pkg_name} +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +Package with user and developer documentation of %{pkg_name}. + +%prep +%setup -q -n %{pkg_name}-%{version}%{?prerel} +# Remove bundled egg-info +rm -rf %{pkg_name}.egg-info +# remove Fedora assistant set +rm -rf %{pkg_name}/data + +# don't require PyGithub in DTS version +%patch2 -p0 + +%patch4 -p0 + +%build +%{?scl:scl enable %{scl} - << \EOF} +%{__python} setup.py build +%{?scl:EOF} + +pushd docs +make html +rm _build/html/.buildinfo +popd + +%install +%{?scl:scl enable %{scl} - << \EOF} +%{__python} setup.py install --skip-build --root %{buildroot} \ + --install-purelib %{python_sitelib} \ + --install-scripts %{_bindir} +%{?scl:EOF} + +# install manpages for both short and long forms of the binaries +mkdir -p %{buildroot}%{_mandir}/man1 +install -p manpages/%{shortname}.1 %{buildroot}%{_mandir}/man1 +install -p manpages/%{shortname}-gui.1 %{buildroot}%{_mandir}/man1 +install -p manpages/%{pkg_name}.1 %{buildroot}%{_mandir}/man1 +install -p manpages/%{pkg_name}-gui.1 %{buildroot}%{_mandir}/man1/%{pkg_name}-gui.1 + +# create the %%{_datadir} hierarchy +pushd %{buildroot}%{_datadir} +mkdir -p %{pkg_name}/{assistants,files,icons,snippets} +mkdir -p %{pkg_name}/assistants/{crt,mod,prep,task} +# files are also for snippets +mkdir -p %{pkg_name}/files/{crt,mod,prep,task,snippets} +mkdir -p %{pkg_name}/icons/{crt,mod,prep,task} + +# first, do the alterations to paths in devassistant +pushd %{buildroot}%{python_sitelib} +patch -p0 < %{PATCH0} +sed -i 's|_DATADIR_DEVASSISTANT|%{_datadir}/%{pkg_name}|' devassistant/settings.py +sed -i 's|_DATADIR_LOCAL_DEVASSISTANT|%{_prefix}/local/share/%{pkg_name}|' devassistant/settings.py +popd + +# remove files containing unsupported functionality; they'll not be part of final upstream release +rm %{buildroot}%{python_sitelib}/%{pkg_name}/gui/{creator_window.py*,devel-yaml.glade} + +%files +%doc README.rst LICENSE +%{_bindir}/%{shortname} +%{_bindir}/%{shortname}-gui +%{_bindir}/%{pkg_name} +%{_bindir}/%{pkg_name}-gui +%{_datadir}/%{pkg_name} +%{_mandir}/man1/%{shortname}.1.gz +%{_mandir}/man1/%{shortname}-gui.1.gz +%{_mandir}/man1/%{pkg_name}.1.gz +%{_mandir}/man1/%{pkg_name}-gui.1.gz +%{python_sitelib}/%{pkg_name} +%{python_sitelib}/%{pkg_name}-%{version}%{?prerel}-py?.?.egg-info + +%files doc +%doc docs/_build/html + +%changelog +* Mon Jun 23 2014 Bohuslav Kabrda - 0.9.1-1 +- Update to 0.9.1 final + +* Thu May 29 2014 Bohuslav Kabrda - 0.9.0-3 +- Make paths alteration patch apply cleanly. + +* Tue May 27 2014 Bohuslav Kabrda - 0.9.0-2 +- Remove the unsupported code from GUI. + +* Tue May 27 2014 Bohuslav Kabrda - 0.9.0-1 +- Update to 0.9.0 final + +* Thu May 22 2014 Bohuslav Kabrda - 0.9.0-0.3.b1 +- Rebuilt for RHEL 7 + +* Thu May 22 2014 Bohuslav Kabrda - 0.9.0-0.2.b1 +- Alter /usr/local/share/devassistant path to point to /opt, too. + +* Wed May 21 2014 Bohuslav Kabrda - 0.9.0-0.1.b1 +- Rebuilt for devassist09 +- Updated to DevAssistant 0.9.0b1 + +* Mon Apr 14 2014 Tomas Radej - 0.8.0-3 +- Added CC-BY-SA to License field because of appdata.xml + +* Fri Feb 28 2014 Miro Hrončok - 0.8.0-2 +- Backport fix of GitHub errors. + +* Wed Dec 04 2013 Bohuslav Kabrda - 0.8.0-1 +- Update to 0.8.0. +- Don't create the /usr/local hierarchy, leave it up to users. + +* Wed Oct 02 2013 Bohuslav Kabrda - 0.7.0-1 +- Update to 0.7.0. + +* Wed Aug 28 2013 Bohuslav Kabrda - 0.6.1-2 +- Properly create and own the /usr/local hierarchy. + +* Wed Aug 28 2013 Bohuslav Kabrda - 0.6.1-1 +- Update to 0.6.1. +- Introduce gui, add its dependencies. + +* Sat Aug 03 2013 Fedora Release Engineering - 0.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Jul 26 2013 Bohuslav Kabrda - 0.5.0-1 +- Update to 0.5.0. +- Regenerated patch0. + +* Wed Jul 17 2013 Petr Pisar - 0.4.0-3 +- Perl 5.18 rebuild + +* Wed Jul 03 2013 Bohuslav Kabrda - 0.4.0-2 +- Fix manpage typo, rhbz#980646. + +* Mon Jul 01 2013 Bohuslav Kabrda - 0.4.0-1 +- Update to 0.4.0. + +* Wed May 15 2013 Bohuslav Kabrda - 0.3.1-1 +- Update to 0.3.1. +- Remove no longer needed dependencies (jinja2, plumbum). + +* Wed Mar 20 2013 Bohuslav Kabrda - 0.2.2-1 +- Update to 0.2.2 because of minor bug in 0.2.1. + +* Wed Mar 20 2013 Bohuslav Kabrda - 0.2.1-1 +- Update to devassistant 0.2.1. +- Introduce bash completion script. + +* Mon Mar 18 2013 Bohuslav Kabrda - 0.2.0-1 +- Update to devassistant 0.2.0. +- Move assistants and snippets to %%{datadir}/%%{pkg_name}. +- Introduce manpage. + +* Tue Mar 12 2013 Bohuslav Kabrda - 0.1.0-3 +- Move templates to %%{_datadir}. + +* Tue Mar 12 2013 Bohuslav Kabrda - 0.1.0-2 +- Use BR: python2-devel instead of python-devel. + +* Fri Mar 08 2013 Bohuslav Kabrda - 0.1.0-1 +- Initial package.