From 6d42de27c0fea4814befbe1e6cbe814c74c36866 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Wed, 30 Jul 2014 22:12:49 +0200 Subject: [PATCH 1/3] Update to new upstream version 2.0.28 (BZ 1123961) --- .gitignore | 1 + anki.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 997e13a..b0de24e 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ anki-1.0.1.tgz /anki-2.0.22.tgz /anki-2.0.25.tgz /anki-2.0.26.tgz +/anki-2.0.28.tgz diff --git a/anki.spec b/anki.spec index 16809b6..ab5bf32 100644 --- a/anki.spec +++ b/anki.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki -Version: 2.0.26 +Version: 2.0.28 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning @@ -106,6 +106,9 @@ s:\(.*\):%dir \1:' >>anki.lang %{_datadir}/appdata/anki.appdata.xml %changelog +* Wed Jul 30 2014 Christian Krause - 2.0.28-1 +- Update to new upstream version 2.0.28 (BZ 1123961) + * Tue May 20 2014 Christian Krause - 2.0.26-1 - Update to new upstream version 2.0.26 (BZ 1090863) - Add appdata diff --git a/sources b/sources index eee3cca..af11f55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c3af007dbda797e5f587b450691d93c9 anki-2.0.26.tgz +a03dbbe550cba3f85c87e1aec2ebdbd5 anki-2.0.28.tgz From c9c4d6522a48907f2c663f8268fb3da1ba8bae32 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Sun, 9 Nov 2014 18:56:26 +0100 Subject: [PATCH 2/3] Update to new upstream version 2.0.31 (BZ 1144973) --- .gitignore | 1 + anki.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b0de24e..ff4421c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ anki-1.0.1.tgz /anki-2.0.25.tgz /anki-2.0.26.tgz /anki-2.0.28.tgz +/anki-2.0.31.tgz diff --git a/anki.spec b/anki.spec index ab5bf32..bc1028b 100644 --- a/anki.spec +++ b/anki.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki -Version: 2.0.28 +Version: 2.0.31 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning @@ -106,6 +106,9 @@ s:\(.*\):%dir \1:' >>anki.lang %{_datadir}/appdata/anki.appdata.xml %changelog +* Mon Nov 03 2014 Christian Krause - 2.0.31-1 +- Update to new upstream version 2.0.31 (BZ 1144973) + * Wed Jul 30 2014 Christian Krause - 2.0.28-1 - Update to new upstream version 2.0.28 (BZ 1123961) diff --git a/sources b/sources index af11f55..014dbba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a03dbbe550cba3f85c87e1aec2ebdbd5 anki-2.0.28.tgz +7e75a9c44897ba608c0dda2c0e1a096f anki-2.0.31.tgz From ee7e5fbbd401373ec639f7db2254729db0e2f30a Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Mon, 6 Apr 2015 02:15:32 +0200 Subject: [PATCH 3/3] Update to new upstream version 2.0.32 (BZ 1205471) - Move icon to %{_datadir}/icons/hicolor/scalable/apps - Modify svg icon to use only the subset of the SVG specification which is implemented by Qt's SVG library - Add keywords to desktop file --- .gitignore | 1 + anki.spec | 25 +++++- anki.svg | 237 ++++++++++++++++++++++++++++++----------------------- sources | 2 +- 4 files changed, 159 insertions(+), 106 deletions(-) diff --git a/.gitignore b/.gitignore index ff4421c..1eed3d6 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ anki-1.0.1.tgz /anki-2.0.26.tgz /anki-2.0.28.tgz /anki-2.0.31.tgz +/anki-2.0.32.tgz diff --git a/anki.spec b/anki.spec index bc1028b..8b1d872 100644 --- a/anki.spec +++ b/anki.spec @@ -1,7 +1,7 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki -Version: 2.0.31 +Version: 2.0.32 Release: 1%{?dist} Summary: Flashcard program for using space repetition learning @@ -16,6 +16,7 @@ Source2: anki.appdata.xml Patch0: anki-2.0.3-noupdate.patch BuildRequires: python2-devel, python-setuptools, python-sqlalchemy BuildRequires: desktop-file-utils, PyQt4, python-simplejson +Requires: hicolor-icon-theme Requires: qt4, PyQt4 Requires: python-sqlalchemy, python-simplejson Requires: python-matplotlib @@ -57,8 +58,8 @@ install -m 644 README* %{buildroot}%{_pkgdocdir}/ install -d %{buildroot}%{_datadir}/mime/packages install -m 644 anki.xml %{buildroot}%{_datadir}/mime/packages -install -d %{buildroot}%{_datadir}/pixmaps -install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/ +install -d %{buildroot}%{_datadir}/icons/hicolor/scalable/apps +install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ install -d %{buildroot}%{_mandir}/man1 install -m 644 anki.1 %{buildroot}%{_mandir}/man1/ @@ -68,6 +69,7 @@ install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/ desktop-file-install \ --remove-category=KDE \ + --set-key=Keywords --set-value="learn;education;memorizing;language;flashcard;spaced repetition;" \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop @@ -86,10 +88,18 @@ s:\(.*\):%dir \1:' >>anki.lang %post /usr/bin/update-desktop-database &> /dev/null || : /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun /usr/bin/update-desktop-database &> /dev/null || : /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %doc LICENSE.* README* @@ -100,12 +110,19 @@ s:\(.*\):%dir \1:' >>anki.lang %{_datadir}/%{name}/anki/ %{_datadir}/%{name}/thirdparty/ %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.* +%{_datadir}/icons/hicolor/scalable/apps/%{name}.* %{_datadir}/mime/packages/anki.xml %{_mandir}/man1/%{name}.* %{_datadir}/appdata/anki.appdata.xml %changelog +* Sun Apr 05 2015 Christian Krause - 2.0.32-1 +- Update to new upstream version 2.0.32 (BZ 1205471) +- Move icon to %%{_datadir}/icons/hicolor/scalable/apps +- Modify svg icon to use only the subset of the SVG specification + which is implemented by Qt's SVG library +- Add keywords to desktop file + * Mon Nov 03 2014 Christian Krause - 2.0.31-1 - Update to new upstream version 2.0.31 (BZ 1144973) diff --git a/anki.svg b/anki.svg index ecd7797..7a24e83 100644 --- a/anki.svg +++ b/anki.svg @@ -14,23 +14,10 @@ height="33" id="svg3652" version="1.1" - inkscape:version="0.48.1 r9760" - sodipodi:docname="New document 10"> + inkscape:version="0.48.5 r10040" + sodipodi:docname="anki.svg"> - - - + + + + + + + inkscape:window-width="1920" + inkscape:window-height="1145" + inkscape:window-x="-2" + inkscape:window-y="-3" + inkscape:window-maximized="1" + inkscape:snap-global="false" /> @@ -160,83 +206,72 @@ inkscape:groupmode="layer" id="layer1" transform="translate(0,-1019.3622)"> - - - - - - - - + + + + + + diff --git a/sources b/sources index 014dbba..7be6088 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e75a9c44897ba608c0dda2c0e1a096f anki-2.0.31.tgz +2186925ffa068017a30734e75b8a8ad7 anki-2.0.32.tgz