Sending some unpushed experiments

5 files changed, 92 insertions, 75 deletions

diff --git a/mycroft/mycroft/mycroft.spec b/mycroft/mycroft/mycroft.spec
index a988593..8c8f65b 100644
--- a/mycroft/mycroft/mycroft.spec
+++ b/mycroft/mycroft/mycroft.spec
@@ -1,70 +1,71 @@
-%bcond_with	tests
-%bcond_without	doc
+%bcond_with     tests
+%bcond_without  doc
 
-Name:		mycroft
-Version:	20.2.4
-Release:	2%{?dist}
-Summary:	Mycroft is a hackable open source voice assistant
+Name:           mycroft
+Version:        21.2.0
+Release:        2%{?dist}
+Summary:        Mycroft is a hackable open source voice assistant
 
-%global tag release/v%{version}
 %global forgeurl https://github.com/MycroftAI/mycroft-core
+%global tag release/v%{version}
 %forgemeta
 
-License:	ASL 2.0
-URL:		https://mycroft.ai/
-Source0:	%{forgesource}
+License:        ASL 2.0
+URL:            https://mycroft.ai/
+Source0:        %{forgesource}
 
 # TODO: Adapt Mycroft commands.
 
 # Mycroft command
-Source1:	mycroft
+Source1:        mycroft
 
 # Mycroft Fedora configuration
-Source2:	mycroft.conf
+Source2:        mycroft.conf
 
-BuildArch:	noarch
+BuildArch:      noarch
 
-%package	core
-Summary:	Core package for Mycroft
+%package        core
+Summary:        Core package for Mycroft
 
-BuildRequires:	python3-devel
+BuildRequires:  python3-devel
 BuildRequires:  python3dist(setuptools)
 BuildRequires:  python-unversioned-command
 
-Requires:	mimic
+Requires:       mimic
 
-Requires:	mpg123
-Requires:	mpg123-plugins-pulseaudio
-Requires:	pulseaudio-utils
+Requires:       mpg123
+Requires:       mpg123-plugins-pulseaudio
+Requires:       pulseaudio-utils
 
 # Requirements
-Requires:	python3-six >= 1.13.0
-Requires:	python3-requests >= 2.20.0
-Requires:	python3-gtts >= 2.0.4
-Requires:	python3-pyaudio >= 0.2.11
-Requires:	python3-ee >= 5.0.0
-Requires:	python3-speech_recognition >= 3.8.1
-Requires:	python3-tornado >= 6.0.3
-Requires:	python3-websocket-client >= 0.56.0
-Requires:	python-requests-futures >= 0.9.5
-Requires:	python3-pyserial >= 3.0.0
-Requires:	python3-psutil >= 5.6.6
-Requires:	python3-pocketsphinx < 5
-Requires:	python3-inflection >= 0.3.1
-Requires:	python3-pillow
-Requires:	python3-dateutil >= 2.6.0
-Requires:	python3-fasteners >= 0.14.1
-Requires:	python3-pyyaml >= 5.1.2
-Requires:	python3-lingua-franca >= 0.2.1
-Requires:	python3-msm >= 0.8.7
-Requires:	python3-msk >= 0.3.15
-Requires:	python3-adapt-parser >= 0.3.4
-Requires:	python3-padatious >= 0.4.8
-Requires:	python3-fann2 >= 1.0.7
-Requires:	python3-padaos >= 0.1.9
-Requires:	python3-precise-runner >= 0.2.1
-Requires:	python3-petact >= 0.1.2
-Requires:	python3-pyxdg >= 0.26
+Requires:       python3dist(six) >= 1.13.0
+Requires:       python3dist(requests) >= 2.20.0
+Requires:       python3dist(gtts) >= 2.2.2
+Requires:       python3dist(pyaudio) >= 0.2.11
+Requires:       python3dist(ee) >= 8.1.0
+Requires:       python3dist(speech_recognition) >= 3.8.1
+Requires:       python3dist(tornado) >= 6.0.3
+Requires:       python3dist(websocket-client) >= 0.54.0
+Requires:       python3dist(requests-futures) >= 0.9.5
+Requires:       python3dist(pyserial) >= 3.0.0
+Requires:       python3dist(psutil) >= 5.6.6
+Requires:       python3dist(pocketsphinx) < 5
+Requires:       python3dist(inflection) >= 0.3.1
+Requires:       python3dist(pillow) >= 8.2.0
+Requires:       python3dist(dateutil) >= 2.6.0
+Requires:       python3dist(fasteners) >= 0.14.1
+Requires:       python3dist(pyyaml) >= 5.4.0
+Requires:       python3dist(lingua-franca) >= 0.4.2
+Requires:       python3dist(msm) >= 0.8.9
+Requires:       python3dist(msk) >= 0.3.16
+Requires:       python3dist(mycroft-messagebus-client) >= 0.9.1
+Requires:       python3dist(adapt-parser) >= 0.5.1
+Requires:       python3dist(padatious) >= 0.4.8
+Requires:       python3dist(fann2) >= 1.0.7
+Requires:       python3dist(padaos) >= 0.1.9
+Requires:       python3dist(precise-runner) >= 0.2.1
+Requires:       python3dist(petact) >= 0.1.2
+Requires:       python3dist(pyxdg) >= 0.26
 
 %{?python_disable_dependency_generator}
 
@@ -75,12 +76,12 @@ Requires:	python3-pyxdg >= 0.26
 # Extra Requirements
 
 %if %{with doc}
-%package	doc
-Summary:	Documentation for mycroft
+%package        doc
+Summary:        Documentation for mycroft
 
 # Doc Requirements
-BuildRequires:	python3-sphinx >= 2.2.1
-BuildRequires:	python3-sphinx_rtd_theme >= 0.4.3
+BuildRequires:  python3dist(sphinx) >= 2.2.1
+BuildRequires:  python3dist(sphinx_rtd_theme) >= 0.4.3
 %endif
 
 
@@ -93,12 +94,12 @@ extended, and improved. Mycroft may be used in anything from a science project
 to an enterprise software application.
 
 
-%description	core
+%description    core
 Core package for Mycroft.
 
 
 %if %{with doc}
-%description	doc
+%description    doc
 Additionnal documentation for mycroft.
 %endif
 
@@ -131,7 +132,7 @@ cp %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}
 %endif
 
 
-%files		core
+%files          core
 %doc README.md ACKNOWLEDGEMENTS.md
 %license LICENSE.md
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
@@ -141,11 +142,14 @@ cp %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}
 
 
 %if %{with doc}
-%files 	       doc
+%files          doc
 %doc html
 %endif
 
 
 %changelog
-* Mon Jun  8 2020 Lyes Saadi <fedora@lyes.eu>
+* Sat Aug 14 2020 Lyes Saadi <fedora@lyes.eu>
+- Updating to 21.2.0
+
+* Mon Jun 08 2020 Lyes Saadi <fedora@lyes.eu>
 - Initial Package
diff --git a/mycroft/python-adapt-parser/python-adapt-parser.spec b/mycroft/python-adapt-parser/python-adapt-parser.spec
index 5e05a63..2e2ef2e 100644
--- a/mycroft/python-adapt-parser/python-adapt-parser.spec
+++ b/mycroft/python-adapt-parser/python-adapt-parser.spec
@@ -1,15 +1,13 @@
 %global pypi_name adapt-parser
 
 Name:           python-%{pypi_name}
-Version:        0.3.5
+Version:        1.0.0
 Release:        1%{?dist}
 Summary:        A text-to-intent parsing framework
 
 License:        ASL 2.0
 URL:            https://github.com/MycroftAI/adapt
 Source0:        %{pypi_source}
-# Adding the license file as it is not included in the pypi tarball.
-Source1:	https://raw.githubusercontent.com/MycroftAI/adapt/master/LICENSE.md
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -29,7 +27,7 @@ structured intent that can then be invoked programatically.
 Summary:        %{summary}
 %{?python_provide:%python_provide python3-%{pypi_name}}
 
-Requires:       python3-ee >= 5
+Requires:       python3dist(ee) >= 8.1
 Requires:       python3dist(six) >= 1.10
 
 %description -n python3-%{pypi_name} %_description
@@ -38,7 +36,6 @@ Requires:       python3dist(six) >= 1.10
 %autosetup -n %{pypi_name}-%{version}
 # Remove bundled egg-info
 rm -rf %{pypi_name}.egg-info
-cp %{SOURCE1} .
 
 %build
 %py3_build
@@ -53,5 +50,17 @@ cp %{SOURCE1} .
 %{python3_sitelib}/adapt_parser-%{version}-py%{python3_version}.egg-info
 
 %changelog
+* Thu Sep 30 2021 Lyes Saadi <fedora@lyes.eu> - 1.0.0-1
+- Updating to 1.0.0
+
+* Mon Sep 13 2021 Lyes Saadi <fedora@lyes.eu> - 0.6.1-1
+- Updating to 0.6.1
+
+* Sun Sep 12 2021 Lyes Saadi <fedora@lyes.eu> - 0.6.0-1
+- Updating to 0.6.0
+
+* Sun Aug 15 2021 Lyes Saadi <fedora@lyes.eu> - 0.5.1-1
+- Updating to 0.5.1
+
 * Sat Jun 06 2020 Lyes Saadi <fedora@lyes.eu> - 0.3.5-1
 - Initial Package
diff --git a/mycroft/python-lingua-franca/python-lingua-franca.spec b/mycroft/python-lingua-franca/python-lingua-franca.spec
index 362413f..bb97729 100644
--- a/mycroft/python-lingua-franca/python-lingua-franca.spec
+++ b/mycroft/python-lingua-franca/python-lingua-franca.spec
@@ -1,6 +1,6 @@
 %global pypi_name lingua-franca
 
-%global tag 0.2.1
+%global tag 0.4.2
 
 Name:           python-%{pypi_name}
 Version:        %{tag}
@@ -25,10 +25,10 @@ speakers with different native tongues.
 
 %{?python_disable_dependency_generator}
 
-%package -n python3-%{pypi_name}
+%package -n     python3-%{pypi_name}
 Summary:        %{summary}
 
-Requires:  python3-dateutil
+Requires:       python3-dateutil
 BuildRequires:  python3-devel
 BuildRequires:  python3-dateutil
 
@@ -49,12 +49,15 @@ rm -rf %{buildroot}%{python3_sitelib}/test
 #%%check
 #%%{python3} setup.py test
 
-%files -n python3-%{pypi_name}
+%files -n       python3-%{pypi_name}
 %doc readme.md
 %license LICENSE
 %{python3_sitelib}/lingua_franca/
 %{python3_sitelib}/lingua_franca-*.egg-info/
 
 %changelog
-* Sat Jun  6 2020 Lyes Saadi <fedora@lyes.eu>
+* Sun Aug 15 2021 Lyes Saadi <fedora@lyes.eu> - 0.4.2-1
+- Updating to 0.4.2
+
+* Sat Jun 06 2020 Lyes Saadi <fedora@lyes.eu>
 - Initial Package
diff --git a/mycroft/python-msk/python-msk.spec b/mycroft/python-msk/python-msk.spec
index b4239b0..110bd65 100644
--- a/mycroft/python-msk/python-msk.spec
+++ b/mycroft/python-msk/python-msk.spec
@@ -1,15 +1,13 @@
 %global pypi_name msk
 
 Name:           python-%{pypi_name}
-Version:        0.3.15
+Version:        0.3.16
 Release:        1%{?dist}
 Summary:        Mycroft Skills Kit
 
 License:        ASL 2.0
 URL:            https://github.com/MycroftAI/mycroft-skills-kit
 Source0:        %{pypi_source}
-# License is not distributed with pypi tarball. See #4.
-Source1:	https://raw.githubusercontent.com/MycroftAI/mycroft-skills-kit/master/LICENSE
 BuildArch:      noarch
 
 BuildRequires:  python3-devel
@@ -57,13 +55,16 @@ cp %{SOURCE1} .
 #%%check
 #%%{__python3} setup.py test
 
-%files -n python3-%{pypi_name}
+%files -n       python3-%{pypi_name}
 %doc README.md
 %license LICENSE
 %{_bindir}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
 
-%changelog
+%changelog 
+* Sun Aug 15 2020 Lyes Saadi <fedora@lyes.eu> - 0.3.16-1
+- Updating to 0.3.16
+
 * Sat Jun 06 2020 Lyes Saadi <fedora@lyes.eu> - 0.3.15-1
 - Initial Package
diff --git a/mycroft/python-msm/python-msm.spec b/mycroft/python-msm/python-msm.spec
index 43a9f80..87eaea3 100644
--- a/mycroft/python-msm/python-msm.spec
+++ b/mycroft/python-msm/python-msm.spec
@@ -1,8 +1,8 @@
 %global pypi_name msm
 
 Name:           python-%{pypi_name}
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.9
+Release:        1%{?dist}
 Summary:        Mycroft Skills Manager
 
 License:        ASL 2.0
@@ -14,7 +14,7 @@ BuildArch:      noarch
 # by default, skills are installed system-wide. This is not the behaviour in
 # the RPM-based mycroft, where skills are user-wide, so this will rely on pip
 # user installation instead ;).
-Patch0:			msm-no-sudo-pip.patch
+Patch0:         msm-no-sudo-pip.patch
 
 BuildRequires:  python3-devel
 BuildRequires:  python3dist(setuptools)
@@ -53,7 +53,7 @@ rm -rf %{pypi_name}.egg-info
 %py3_install
 rm %{buildroot}%{_prefix}/%{pypi_name}/LICENSE
 
-%files -n python3-%{pypi_name}
+%files -n       python3-%{pypi_name}
 %license LICENSE
 %{_bindir}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}