Version 6.1.10

Moved eric6.appdata.xml to %{_datadir}/appdata/

diff --git a/eric6.spec b/eric6.spec
index 6c2b85055410137009bc7e78e8fd43e3068cf22f..511863e0304edd1dd053744871cd2702812c02b2 100644 (file)
--- a/eric6.spec
+++ b/eric6.spec
@@ -5,18 +5,18 @@ Summary:      Eric6 - a full featured Python IDE
 Summary(pl.UTF-8):     Eric6 - pełnowartościowe IDE dla Pythona
 # Name must match the python module/package name (as on pypi or in 'import' statement)
 Name:          eric6
-Version:       6.1.9
-Release:       1
+Version:       6.1.10
+Release:       0.1
 License:       GPL v3
 Group:         Libraries/Python
-Source0:       https://sourceforge.net/projects/eric-ide/files/eric6/stable/%{version}/eric6-%{version}.tar.gz
-# Source0-md5: 8ced922333bb7c8a644f2c9d72a60b58
+Source0:       https://sourceforge.net/projects/eric-ide/files/eric6/stable/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: b08a7669c6d2bb55e32e1bf1b82646f9
 URL:           http://eric-ide.python-projects.org/index.html
 BuildRequires: rpm-pythonprov
 # for the py_build, py_install macros
-BuildRequires: rpmbuild(macros) >= 1.714
 BuildRequires: python-modules
 BuildRequires: python-setuptools
+BuildRequires: rpmbuild(macros) >= 1.714
 # NOTE: As for 6.1.8  eric6 still tries to import PyQt5 while having PyQt4 leading to crash
 #      http://die-offenbachs.homelinux.org:48888/issues/issue204
 # for --pyqt=4
@@ -25,8 +25,8 @@ BuildRequires:        python-setuptools
 # for --pyqt=5
 BuildRequires: python-PyQt5-qscintilla2
 BuildRequires: python-PyQt5-uic
-Requires:      python-modules
 Requires:      python-PyQt5-qscintilla2
+Requires:      python-modules
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,6 +48,8 @@ używającym PyQt i QScintilla.
 %install
 rm -rf $RPM_BUILD_ROOT
 python install.py -z -c -b %{_bindir} -d %{py_sitescriptdir} -i $RPM_BUILD_ROOT  --pyqt=5
+mkdir $RPM_BUILD_ROOT%{_datadir}/appdata
+mv $RPM_BUILD_ROOT%{_datadir}/metainfo/eric6.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +76,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_pixmapsdir}/eric*.png
 %{_desktopdir}/eric6.desktop
 %{_desktopdir}/eric6_webbrowser.desktop
-# /usr/share/metainfo/eric6.appdata.xml
+%{_datadir}/appdata/eric6.appdata.xml
 %{py_sitescriptdir}/eric6config.py
 %{py_sitescriptdir}/eric6plugins