From 2600b6de413672c98ac33083bf085fdcb3fca64c Mon Sep 17 00:00:00 2001 From: Jiri Popelka Date: Sep 30 2015 16:00:39 +0000 Subject: Merge branch 'f22' into f23 --- diff --git a/mnemosyne.spec b/mnemosyne.spec index 5a60cc6..b5b657e 100644 --- a/mnemosyne.spec +++ b/mnemosyne.spec @@ -1,7 +1,7 @@ Name: mnemosyne Summary: Flash-card learning tool Version: 2.3.3 -Release: 3%{?dist} +Release: 4%{?dist} URL: http://www.mnemosyne-proj.org/ Source0: http://downloads.sourceforge.net/sourceforge/mnemosyne-proj/Mnemosyne-%{version}.tar.gz Patch0: mnemosyne-desktop.patch @@ -14,6 +14,8 @@ BuildRequires: python-setuptools Requires: hicolor-icon-theme Requires: PyQt4 Requires: python-matplotlib-qt4 +# Until bug #1219556 is fixed +Requires: python-matplotlib-qt5 Requires: python-cherrypy Requires: python-webob @@ -72,6 +74,9 @@ fi %{_datadir}/icons/hicolor/*/apps/%{name}.png %changelog +* Wed Sep 30 2015 Jiri Popelka - 2.3.3-4 +- Requires: python-matplotlib-qt5 due to bug #1219556 + * Tue Aug 11 2015 Jiri Popelka - 2.3.3-3 - %%py2_build && %%py2_install