churchyard pushed to devassistant (f22). "Updated to latest upstream version, cleanup"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 17 15:26:14 UTC 2015
>From c9ae5563d006a7659ec9f5defdf17f06ecba72c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
Date: Fri, 17 Apr 2015 16:09:17 +0200
Subject: Updated to latest upstream version, cleanup
diff --git a/.gitignore b/.gitignore
index 45befe1..3a39fe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/devassistant-0.9.3.tar.gz
/devassistant-0.10.2.tar.gz
/devassistant-0.10.3.tar.gz
+/devassistant-0.11.0.tar.gz
diff --git a/da.py b/da.py
new file mode 100644
index 0000000..2ff4fd0
--- /dev/null
+++ b/da.py
@@ -0,0 +1,4 @@
+#!/usr/bin/env python3
+from devassistant.cli.cli_runner import CliRunner
+
+CliRunner.run()
diff --git a/devassistant-0.6.0-alter-paths-for-fedora.patch b/devassistant-0.6.0-alter-paths-for-fedora.patch
deleted file mode 100644
index 52111da..0000000
--- a/devassistant-0.6.0-alter-paths-for-fedora.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/devassistant/settings.py b/devassistant/settings.py
-index 2bf1f0f..f39054f 100644
---- a/devassistant/settings.py
-+++ b/devassistant/settings.py
-@@ -15,7 +15,7 @@ SUBASSISTANT_N_STRING = 'subassistant_{0}'
- SUBASSISTANT_N_STRING = 'subassistant_{0}'
- 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=['crt', 'mod', 'prep']
diff --git a/devassistant-0.9.3-fix-nodejs-assistants.patch b/devassistant-0.9.3-fix-nodejs-assistants.patch
deleted file mode 100644
index d0b687f..0000000
--- a/devassistant-0.9.3-fix-nodejs-assistants.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit ea9a21f2c1854a8f4a58a4acdd64514e50187a16
-Author: Slavek Kabrda <bkabrda at redhat.com>
-Date: Tue Nov 25 11:28:52 2014 +0100
-
- Make sure to create the top level directory and switch to it
-
-diff --git a/devassistant/data/assistants/crt/nodejs/app.yaml b/devassistant/data/assistants/crt/nodejs/app.yaml
-index a9e20f9..4b4650c 100644
---- a/devassistant/data/assistants/crt/nodejs/app.yaml
-+++ b/devassistant/data/assistants/crt/nodejs/app.yaml
-@@ -97,6 +97,8 @@ run:
- - $basename~: $(basename "$name")
- - if $(test -e "$name"):
- - log_e: '$name already exists, cannot proceed.'
-+- cl: mkdir -p "$dirname"
-+- cl: cd "$dirname"
- - cl: cp -r *appnodejs "$basename"
- - dda_c: "$basename"
- - cl: cd "$basename"
-diff --git a/devassistant/data/assistants/crt/nodejs/express.yaml b/devassistant/data/assistants/crt/nodejs/express.yaml
-index 36c1b33..641810a 100644
---- a/devassistant/data/assistants/crt/nodejs/express.yaml
-+++ b/devassistant/data/assistants/crt/nodejs/express.yaml
-@@ -110,6 +110,8 @@ run:
- - if $(test -e "$name"):
- - log_e: '$name already exists, cannot proceed.'
- - log_i: 'Creating Express.JS project $basename in $dirname ...'
-+- cl: mkdir -p "$dirname"
-+- cl: cd "$dirname"
- - cl: express --css stylus --ejs "$basename"
- - dda_c: $basename
- - cl: cd "$basename"
-
-commit 822c80193195af61c81be4a0ef61ae50c7653d88
-Author: Slavek Kabrda <bkabrda at redhat.com>
-Date: Tue Nov 25 11:08:32 2014 +0100
-
- Add forgotten nodejs-express dependency, rhbz#1167570
-
-diff --git a/devassistant/data/assistants/crt/nodejs/express.yaml b/devassistant/data/assistants/crt/nodejs/express.yaml
-index e26b8f1..36c1b33 100644
---- a/devassistant/data/assistants/crt/nodejs/express.yaml
-+++ b/devassistant/data/assistants/crt/nodejs/express.yaml
-@@ -33,6 +33,7 @@ dependencies:
- - rpm: ['nodejs-delayed-stream']
- - rpm: ['nodejs-devel']
- - rpm: ['nodejs-editor']
-+ - rpm: ['nodejs-express']
- - rpm: ['nodejs-forever-agent']
- - rpm: ['nodejs-form-data']
- - rpm: ['nodejs-formidable']
diff --git a/devassistant-appdata.patch b/devassistant-appdata.patch
new file mode 100644
index 0000000..e0cba09
--- /dev/null
+++ b/devassistant-appdata.patch
@@ -0,0 +1,47 @@
+From a9d1495dd1341f58af776b0637c83a0e7e41df00 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
+Date: Fri, 17 Apr 2015 16:00:22 +0200
+Subject: [PATCH] Make the appdata file valid
+
+Fixes #368
+---
+ distribution/appdata/devassistant.appdata.xml | 13 ++++++++++---
+ 1 file changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/distribution/appdata/devassistant.appdata.xml b/distribution/appdata/devassistant.appdata.xml
+index 2585027..338f533 100644
+--- a/distribution/appdata/devassistant.appdata.xml
++++ b/distribution/appdata/devassistant.appdata.xml
+@@ -3,11 +3,18 @@
+ <application>
+ <id type="desktop">devassistant.desktop</id>
+ <metadata_license>CC-BY-SA</metadata_license>
+- <project_license>GPL2.0+</project_license>
++ <project_license>GPL-2.0+</project_license>
+ <name>DevAssistant</name>
+ <summary>DevAssistant - making life easier for developers</summary>
+ <description>
+ <p>
++ DevAssistant can help you set up your developing environment, publish your code,
++ and do many of the chores that somehow keep you from the important stuff - writing
++ your software. It does not matter if you only recently discovered the world of software
++ development, or if you have been coding for two decades, there's always something
++ DevAssistant can do to make your life easier.
++ </p>
++ <p>
+ DevAssistant can help you with creating and setting up basic projects
+ in various languages, installing dependencies, setting up environment etc.
+ There are three main types of functionality provided:
+@@ -24,10 +31,10 @@
+ </description>
+ <screenshots>
+ <screenshot type="default" width="702" height="633">
+- https://raw.github.com/devassistant/devassistant/master/appdata/devassistant-main-window.png
++ https://raw.github.com/devassistant/devassistant/master/distribution/appdata/devassistant-main-window.png
+ </screenshot>
+ <screenshot width="642" height="690">
+- https://raw.github.com/devassistant/devassistant/master/appdata/devassistant-params-window.png
++ https://raw.github.com/devassistant/devassistant/master/distribution/appdata/devassistant-params-window.png
+ </screenshot>
+ </screenshots>
+ <url type="homepage">http://devassistant.org/</url>
diff --git a/devassistant-nodejs-files.patch b/devassistant-nodejs-files.patch
deleted file mode 100644
index 2493d57..0000000
--- a/devassistant-nodejs-files.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 3ec0ae9dd2bd348c021262aad20f3515a83884cc Mon Sep 17 00:00:00 2001
-From: Tomas Radej <tradej at redhat.com>
-Date: Tue, 9 Dec 2014 16:03:05 +0100
-Subject: [PATCH 3/3] Moved node.js files to the right location (rhbz#1147119)
-
----
- files/crt/nodejs/app.js | 6 ------
- files/crt/nodejs/app/app.js | 6 ++++++
- 2 files changed, 6 insertions(+), 6 deletions(-)
- delete mode 100644 files/crt/nodejs/app.js
- create mode 100644 files/crt/nodejs/app/app.js
-
-diff --git a/files/crt/nodejs/app.js b/files/crt/nodejs/app.js
-deleted file mode 100644
-index a3716b1..0000000
---- a/files/crt/nodejs/app.js
-+++ /dev/null
-@@ -1,6 +0,0 @@
--var http = require('http');
--http.createServer(function (req, res) {
-- res.writeHead(200, {'Content-Type': 'text/plain'});
-- res.end('Hello World\n');
--}).listen(1337, "127.0.0.1");
--console.log('Server running at http://127.0.0.1:1337/');
-diff --git a/files/crt/nodejs/app/app.js b/files/crt/nodejs/app/app.js
-new file mode 100644
-index 0000000..a3716b1
---- /dev/null
-+++ b/files/crt/nodejs/app/app.js
-@@ -0,0 +1,6 @@
-+var http = require('http');
-+http.createServer(function (req, res) {
-+ res.writeHead(200, {'Content-Type': 'text/plain'});
-+ res.end('Hello World\n');
-+}).listen(1337, "127.0.0.1");
-+console.log('Server running at http://127.0.0.1:1337/');
---
-2.1.0
-
diff --git a/devassistant-php-sample-location.patch b/devassistant-php-sample-location.patch
deleted file mode 100644
index a074cf8..0000000
--- a/devassistant-php-sample-location.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2aeab7dfd45c129014475b289814ba6b222a678d Mon Sep 17 00:00:00 2001
-From: Tomas Radej <tradej at redhat.com>
-Date: Tue, 16 Dec 2014 17:09:27 +0100
-Subject: [PATCH] Correct location for phpMyAdmin (rhbz #1173871)
-
----
- files/crt/php/lamp/apache_config.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/files/crt/php/lamp/apache_config.sh b/files/crt/php/lamp/apache_config.sh
-index a81b3c6..bd72c89 100755
---- a/files/crt/php/lamp/apache_config.sh
-+++ b/files/crt/php/lamp/apache_config.sh
-@@ -2,7 +2,7 @@
-
- MODULE_CONFIG=/etc/httpd/conf.modules.d/00-base.conf
- USERDIR_CONF=/etc/httpd/conf.d/userdir.conf
--SAMPLE_PHPMYADMIN=/usr/share/phpMyAdmin/config.sample.inc.php
-+SAMPLE_PHPMYADMIN=/usr/share/doc/phpMyAdmin/config.sample.inc.php
- NEW_PHPMYADMIN=/usr/share/phpMyAdmin/config.inc.php
- PHP=/usr/bin/php
-
---
-2.1.0
-
diff --git a/devassistant.appdata.xml b/devassistant.appdata.xml
deleted file mode 100644
index 6d5131b..0000000
--- a/devassistant.appdata.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013 Slavek Kabrda <bkabrda at redhat.com> -->
-<application>
- <id type="desktop">devassistant.desktop</id>
- <licence>CC-BY-SA</licence>
- <name>DevAssistant</name>
- <summary>DevAssistant - making life easier for developers</summary>
- <description>
- <p>
- DevAssistant can help you with creating and setting up basic projects
- in various languages, installing dependencies, setting up environment etc.
- There are three main types of functionality provided:
- </p>
- <ul>
- <li>Creating projects in various languages/frameworks</li>
- <li>Modifying local projects</li>
- <li>Preparing environment for upstream projects or custom tasks</li>
- </ul>
- <p>
- List of currently supported languages includes C, C++, Java, Node.js,
- Perl, PHP, Python and Ruby.
- </p>
- </description>
- <screenshots>
- <screenshot type="default" width="702" height="633">
- https://raw.github.com/bkabrda/devassistant/master/appdata/devassistant-main-window.png
- </screenshot>
- <screenshot width="642" height="690">
- https://raw.github.com/bkabrda/devassistant/master/appdata/devassistant-params-window.png
- </screenshot>
- </screenshots>
- <url type="homepage">http://devassistant.org/</url>
- <updatecontact>bkabrda at redhat.com</updatecontact>
-</application>
diff --git a/devassistant.desktop b/devassistant.desktop
deleted file mode 100644
index edf989b..0000000
--- a/devassistant.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=DevAssistant
-GenericName=DevAssistant - making life easier for developers
-Exec=da-gui
-Icon=devassistant
-Terminal=false
-Type=Application
-Categories=Development;
-X-Desktop-File-Install-Version=0.21
diff --git a/devassistant.spec b/devassistant.spec
index bf8fd1f..3e01617 100644
--- a/devassistant.spec
+++ b/devassistant.spec
@@ -7,26 +7,25 @@
%global shortname da
Name: devassistant
-Version: 0.10.3
-Release: 4%{?dist}
+Version: 0.11.0
+Release: 1%{?dist}
Summary: DevAssistant - Making life easier for developers
License: GPLv2+ and CC-BY-SA
-URL: https://github.com/bkabrda/devassistant
+URL: https://devassistant.org
Source0: https://pypi.python.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
-# to get desktop and appdata file:
-# git clone https://github.com/bkabrda/devassistant.git && cd devassistant
-# git checkout v0.10.2
-# # devassistant.desktop, appdata/devassistant.appdata.xml
-Source1: %{name}.desktop
-Source2: %{name}.appdata.xml
+
+# Source1 and Source2 are in upstream now
Source3: %{name}.macros
-Patch0: devassistant-0.6.0-alter-paths-for-fedora.patch
-# Patch for https://bugzilla.redhat.com/show_bug.cgi?id=1167570
-# Combined upstream patches:
-# https://github.com/devassistant/devassistant-assistants-fedora/commit/822c80193195af61c81be4a0ef61ae50c7653d88
-# https://github.com/devassistant/devassistant-assistants-fedora/commit/ea9a21f2c1854a8f4a58a4acdd64514e50187a16
+# This script is required for integration tests and is missing from dist tarball
+# It will be included in the next release
+Source4: da.py
+
+
+# https://github.com/devassistant/devassistant/issues/368
+Patch0: %{name}-appdata.patch
+
BuildArch: noarch
@@ -38,6 +37,7 @@ BuildRequires: python3-flexmock
BuildRequires: python3-jinja2
BuildRequires: python3-progress
BuildRequires: python3-requests
+BuildRequires: python3-scripttest
BuildRequires: python3-setuptools
BuildRequires: python3-six
BuildRequires: python3-PyYAML
@@ -51,19 +51,22 @@ Requires: %{name}-cli = %{version}-%{release}
# Assistant packages
%if ! 0%{?bootstrap}
-Requires: devassistant-dap-c
-Requires: devassistant-dap-cpp
+# Some of the older packages would not work with this version of devassistant
+# Don't confuse 0.11 with devassistant version and don't use %%{version} here!
+Requires: devassistant-dap-c >= 0.11
+Requires: devassistant-dap-cpp >= 0.11
Requires: devassistant-dap-custom
-Requires: devassistant-dap-dap
-Requires: devassistant-dap-devassistant
+Requires: devassistant-dap-dap >= 1.3
+Requires: devassistant-dap-devassistant >= 0.11
+Requires: devassistant-dap-docker >= 0.11
Requires: devassistant-dap-eclipse
Requires: devassistant-dap-github
-Requires: devassistant-dap-java
-Requires: devassistant-dap-nodejs
-Requires: devassistant-dap-perl
-Requires: devassistant-dap-php
-Requires: devassistant-dap-python
-Requires: devassistant-dap-ruby
+Requires: devassistant-dap-java >= 0.11.1
+Requires: devassistant-dap-nodejs >= 0.11
+Requires: devassistant-dap-perl >= 0.11
+Requires: devassistant-dap-php >= 0.11
+Requires: devassistant-dap-python >= 0.11
+Requires: devassistant-dap-ruby >= 0.11
Requires: devassistant-dap-tito
Requires: devassistant-dap-vim
%endif # bootstrap
@@ -130,8 +133,8 @@ GUI is provided by the package devassistant-gui.
Summary: Macros needed for DAP packages distributed via RPM.
# CLI needed for installing and linting
Requires: devassistant-cli
-# License tag "-L" in %install_assistant available from 0.1.8
-Requires: dap2rpm >= 0.1.8
+# 0.1.9 is now sync with the guidelines
+Requires: dap2rpm >= 0.1.9
%description devel
Macros needed for DAP packages distributed via RPM.
@@ -141,10 +144,20 @@ Macros needed for DAP packages distributed via RPM.
# remove bundled egg-info
rm -rf %{name}.egg-info
-cp %{SOURCE1} .
-sed -i '/Version/d' %{name}.desktop
+# copy da.py to it's location
+cp %{SOURCE4} .
+
+# appdata patch
+%patch0 -p1
+
+sed -i '/Version/d' distribution/%{name}.desktop
find -name '*.py' | xargs sed -i '1s,^#!\(/usr/bin/\|/usr/bin/env \)python,#!%{__python3},'
+# generate manpages from source
+pushd distribution/manpages
+ %{__python3} generate_man.py
+popd
+
%build
%{__python3} setup.py build
@@ -158,41 +171,41 @@ mkdir -p %{buildroot}%{_datadir}/%{name}/files/snippets
# manpages
mkdir -p %{buildroot}%{_mandir}/man1
-install -p -m 644 manpages/%{shortname}.1 %{buildroot}%{_mandir}/man1
-install -p -m 644 manpages/%{shortname}-gui.1 %{buildroot}%{_mandir}/man1
-install -p -m 644 manpages/%{name}.1 %{buildroot}%{_mandir}/man1
-install -p -m 644 manpages/%{name}-gui.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 distribution/manpages/%{shortname}.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 distribution/manpages/%{shortname}-gui.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 distribution/manpages/%{name}.1 %{buildroot}%{_mandir}/man1
+install -p -m 644 distribution/manpages/%{name}-gui.1 %{buildroot}%{_mandir}/man1
# bash completion script
mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d/
-install -p -m 644 %{shortname}.bash %{buildroot}%{_sysconfdir}/bash_completion.d/
+install -p -m 644 distribution/%{shortname}.bash %{buildroot}%{_sysconfdir}/bash_completion.d/
# icons
for SIZE in 16x16 22x22 24x24 32x32 48x48 256x256; do
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/$SIZE/apps
- install -p -m 644 icons/hicolor/$SIZE/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/$SIZE/apps/%{name}.png
+ install -p -m 644 distribution/icons/hicolor/$SIZE/%{name}.png %{buildroot}%{_datadir}/icons/hicolor/$SIZE/apps/%{name}.png
mkdir -p %{buildroot}%{_datadir}/icons/HighContrast/$SIZE/apps
- install -p -m 644 icons/HighContrast/$SIZE/%{name}.png %{buildroot}%{_datadir}/icons/HighContrast/$SIZE/apps/%{name}.png
+ install -p -m 644 distribution/icons/HighContrast/$SIZE/%{name}.png %{buildroot}%{_datadir}/icons/HighContrast/$SIZE/apps/%{name}.png
done
# desktop and appdata
-desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications distribution/%{name}.desktop
mkdir -p %{buildroot}/%{_datadir}/appdata
-cp -a %{SOURCE2} %{buildroot}/%{_datadir}/appdata
+cp -a distribution/appdata/devassistant.appdata.xml %{buildroot}/%{_datadir}/appdata
# polkit
mkdir -p %{buildroot}%{_datadir}/polkit-1/actions/
-install -p -m 644 polkit/devassistant_auth.policy %{buildroot}%{_datadir}/polkit-1/actions/
+install -p -m 644 distribution/polkit/devassistant_auth.policy %{buildroot}%{_datadir}/polkit-1/actions/
mkdir -p %{buildroot}%{_libexecdir}
-install -p -m 755 polkit/da_auth %{buildroot}%{_libexecdir}
+install -p -m 755 distribution/polkit/da_auth %{buildroot}%{_libexecdir}
#macros
mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d/
cp %{SOURCE3} %{buildroot}%{_rpmconfigdir}/macros.d/macros.%{name}
%check
-%{__python3} setup.py test -t py.test-%{python3_version}
+%{__python3} setup.py test -t py.test-%{python3_version} -- -m "not webtest"
%post gui
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -211,11 +224,11 @@ fi
%files
%license LICENSE
-%doc README.rst
+%doc README.rst CONTRIBUTORS
%files core
%license LICENSE
-%doc README.rst
+%doc README.rst CONTRIBUTORS
%{_datadir}/%{name}
%{_datadir}/polkit-1/actions/%{name}_auth.policy
%{_libexecdir}/da_auth
@@ -226,7 +239,7 @@ fi
%files gui
%license LICENSE
-%doc README.rst
+%doc README.rst CONTRIBUTORS
%{_bindir}/%{name}-gui
%{_bindir}/%{shortname}-gui
%{_datadir}/applications/%{name}.desktop
@@ -239,7 +252,7 @@ fi
%files cli
%license LICENSE
-%doc README.rst
+%doc README.rst CONTRIBUTORS
%{_bindir}/%{name}
%{_bindir}/%{shortname}
%{_mandir}/man1/%{shortname}.1.gz
@@ -249,10 +262,14 @@ fi
%files devel
%license LICENSE
-%doc README.rst
+%doc README.rst CONTRIBUTORS
%{_rpmconfigdir}/macros.d/macros.%{name}
%changelog
+* Fri Apr 17 2015 Tomas Radej <tradej at redhat.com> - 0.11.0-1
+- Updated to latest upstream version
+- Updated URL
+
* Wed Mar 11 2015 Tomas Radej <tradej at redhat.com> - 0.10.3-4
- Added workaround in -devel macros for rhbz#1200761
diff --git a/sources b/sources
index 41cb256..381818e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-765a40ecdbf1a7bfd8a0070165463715 devassistant-0.10.3.tar.gz
+f434b036a7e01c5ad837b65adc4253ce devassistant-0.11.0.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/devassistant.git/commit/?h=f22&id=c9ae5563d006a7659ec9f5defdf17f06ecba72c7
More information about the scm-commits
mailing list