diff --git a/sonata.spec b/sonata.spec
index 1795741..4fd844e 100644
--- a/sonata.spec
+++ b/sonata.spec
@@ -1,69 +1,24 @@
 Name:          sonata
-Version:       1.6.2.1
-Release:       2mamba
+Version:       1.7.0
+Release:       1mamba
 Summary:       GTK+ music client for MPD
 Group:         System/Libraries/Python
 Vendor:        openmamba
 Distribution:  openmamba
-Packager:      Automatic Build System <autodist@mambasoft.it>
-URL:           http://sonata.berlios.de/
-Source:        http://download.berlios.de/sonata/sonata-%{version}.tar.gz
+Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
+URL:           https://www.berlios.de/software/sonata/
+Source:        https://github.com/multani/sonata.git/v%{version}/sonata-%{version}.tar.bz2
 License:       GPL
-Requires:      python >= %python_version
-Requires:      pyorbit
-Requires:      python-gnome-extras
-Requires:      python-zsi
-Requires:      perl-XML-Parser
-Requires:      dbus-python 
-Requires:      python-notify
-Requires:      pygtk
-Requires:      python-elementtree
-Requires:      python-SOAP
-Requires:      python-tagpy
-Requires:      python-mpd
-BuildRequires: libffi-devel
 ## AUTOBUILDREQ-BEGIN
-BuildRequires: dbus-python-devel
-BuildRequires: glibc-devel
-BuildRequires: libatk-devel
-BuildRequires: libcairo-devel
-BuildRequires: libfontconfig-devel
-BuildRequires: libfreetype-devel
-BuildRequires: libglib-devel
-BuildRequires: libgtk-devel
-BuildRequires: libpango-devel
-BuildRequires: libpython-devel >= %python_version
-BuildRequires: libz-devel
-BuildRequires: perl-XML-Parser
-BuildRequires: pygtk-devel
-BuildRequires: pyorbit
-BuildRequires: python >= %python_version
-BuildRequires: python-elementtree
-BuildRequires: python-gnome-extras-devel
-BuildRequires: python-mpd
-BuildRequires: python-notify
-BuildRequires: python-SOAP
-BuildRequires: python-tagpy
-BuildRequires: python-zsi
+BuildRequires: libpython3-devel
+BuildRequires: python-setuptools-py3
 ## AUTOBUILDREQ-END
+BuildRequires: libffi-devel
 BuildRequires: mpd
-#Versions of packages sonata depends on:
-
-# python 
-# python-central       not installed (source/url not found)
-# python-dbus          installed
-# python-gtk2          installed
-# python-mmkeys        not installed (source/url not found)
-# PyGTK                installed
-
-#Versions of packages sonata recommends:
-
-# python-elementtree   installed
-# python-gnome-extras  installed
-# python-tagpy         installed
-# python-zsi           installed
-
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Requires:      python-dbus-py3
+Requires:      pygobject-py3
+Requires:      python-tagpy-py3
+Requires:      python-mpd2-py3
 
 %description
 Sonata is an elegant GTK+ music client for the Music Player Daemon (MPD).
@@ -88,27 +43,19 @@ Features:
 - Available in 19 languages
 
 %prep
-
 %setup -q
 
 %build
-CFLAGS="%{optflags}" python setup.py build
+CFLAGS="%{optflags}" %{__python3} setup.py build
 
 %install
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
-python setup.py install \
+%{__python3} setup.py install \
    --root="%{buildroot}" \
-   --install-headers=%{_includedir}/python \
-   --install-lib=%{python_sitearch}
+   --install-headers=%{python3_inc} \
+   --install-lib=%{python3_sitearch}
 
-
-mkdir -p %{buildroot}%{_docdir}/%{name}
-
-mv %{buildroot}%{_datadir}/sonata/CHANGELOG %{buildroot}%{_docdir}/%{name}/
-mv %{buildroot}%{_datadir}/sonata/README %{buildroot}%{_docdir}/%{name}/
-mv %{buildroot}%{_datadir}/sonata/TODO %{buildroot}%{_docdir}/%{name}/
-mv %{buildroot}%{_datadir}/sonata/TRANSLATORS %{buildroot}%{_docdir}/%{name}/
-rm %{buildroot}%{_datadir}/sonata -rf
+rm -rf %{buildroot}%{_datadir}/sonata
 
 %find_lang %{name}
 
@@ -118,26 +65,25 @@ rm %{buildroot}%{_datadir}/sonata -rf
 %files -f %{name}.lang
 %defattr(-,root,root)
 %{_bindir}/sonata
-%{python_sitearch}/mmkeys.so
-%dir %{python_sitearch}/sonata
-%{python_sitearch}/sonata/*.py
-%{python_sitearch}/sonata/*.pyc
-%{python_sitearch}/sonata/plugins/*.py
-%{python_sitearch}/sonata/plugins/*.pyc
-%{python_sitearch}/Sonata-%{version}-py*.egg-info
 %{_datadir}/applications/sonata.desktop
-%{_datadir}/pixmaps/*.png
-%{_mandir}/man1/sonata.1.gz
-%dir %{_docdir}/sonata
-%doc %{_docdir}/sonata/CHANGELOG
-%doc %{_docdir}/sonata/README
-%doc %{_docdir}/sonata/TODO
-%doc %{_docdir}/sonata/TRANSLATORS
+%dir %{python3_sitearch}/sonata
+%{python3_sitearch}/sonata/*.py*
+%dir %{python3_sitearch}/sonata/__pycache__
+%{python3_sitearch}/sonata/__pycache__/*
+%dir %{python3_sitearch}/sonata/pixmaps
+%{python3_sitearch}/sonata/pixmaps/*
+%dir %{python3_sitearch}/sonata/plugins
+%{python3_sitearch}/sonata/plugins/*
+%dir %{python3_sitearch}/sonata/ui
+%{python3_sitearch}/sonata/ui/*
+%{python3_sitearch}/Sonata-*-py*.egg-info
+%{_mandir}/man1/sonata.1*
+%doc COPYING
 
-#ImportError: could not import bonobo.ui solved by installing pyorbit
-
-#(111, 'Connection refused') ...
 %changelog
+* Wed Mar 31 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 1.7.0-1mamba
+- update to 1.7.0
+
 * Thu Aug 15 2013 Automatic Build System <autodist@mambasoft.it> 1.6.2.1-2mamba
 - automatic rebuild by autodist