Hello community, here is the log from the commit of package anki for openSUSE:Factory checked in at 2018-08-24 17:03:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/anki (Old) and /work/SRC/openSUSE:Factory/.anki.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "anki" Fri Aug 24 17:03:23 2018 rev:2 rq:628686 version:2.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/anki/anki.changes 2018-01-19 11:51:03.937711694 +0100 +++ /work/SRC/openSUSE:Factory/.anki.new/anki.changes 2018-08-24 17:03:40.850041264 +0200 @@ -1,0 +2,23 @@ +Tue Aug 7 20:05:20 UTC 2018 - toddrme2178@gmail.com + +- Update to 2.1.0. See https://apps.ankiweb.net/docs/changes.html#changes-in-anki-2.1 + for the list of changes. + * Anki 2.1 uses the same scheduling, syncing and file format as Anki 2.0.x, so you can upgrade and downgrade at will. + * It’s built with recent support libraries (Python 3.6, Qt 5.9), bringing fixes for crashes, better handling of high resolution displays, non-Latin text, and the latest web standards. + * It requires a modern system - Windows 7+, OSX 10.10+, or a Linux distro from around 2014+. + * Add-ons will need to be updated to work with 2.1. + * Built in MathJax support + * A "restore backup" option in the profiles screen + * SVG rendering support for LaTeX + * Improved add-on configuration, management and updating + * Night mode for reviewing + * Improved pasting, with less unnecessary formatting included, and better handling of media links. You can hold the shift key when pasting to allow more formatting to be included. +- Rebase patches: + * anki-anki_lang.py.patch + * anki-aqt___init__.py.patch +- Remove unneeded patches + * anki-Makefile.patch +- Update appdata url +- Anki uses python3 and Qt5 now. + +------------------------------------------------------------------- Old: ---- anki-2.0.47-source.tgz anki-Makefile.patch New: ---- anki-2.1.0-source.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ anki.spec ++++++ --- /var/tmp/diff_new_pack.SOLXJo/_old 2018-08-24 17:03:41.366041876 +0200 +++ /var/tmp/diff_new_pack.SOLXJo/_new 2018-08-24 17:03:41.366041876 +0200 @@ -1,7 +1,7 @@ # # spec file for package anki # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,10 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -%bcond_with tests +%bcond_without tests Name: anki -Version: 2.0.47 +Version: 2.1.0 Release: 0 License: AGPL-3.0 Summary: Intelligent Spaced-Repetition Memory Training Program @@ -26,8 +26,6 @@ Group: Productivity/Text/Utilities Source0: https://apps.ankiweb.net/downloads/current/%{name}-%{version}-source.tgz Source1: %{name}.appdata.xml -# PATCH-FIX-OPENSUSE - anki-Makefile.patch -- Fix installation -Patch0: %{name}-Makefile.patch # PATCH-FIX-OPENSUSE - anki-aqt___init__.py.patch -- Load Qt4 translations from the right place Patch1: %{name}-aqt___init__.py.patch # PATCH-FIX-OPENSUSE - anki-anki_lang.py.patch -- Load Anki translations from the right place @@ -37,27 +35,27 @@ BuildRequires: update-desktop-files %endif %if %{with tests} -BuildRequires: python-nose -BuildRequires: python-beautifulsoup -BuildRequires: python-sqlalchemy +BuildRequires: python3-nose %endif -BuildRequires: python-devel -BuildRequires: python-httplib2 -BuildRequires: python-qt4-devel -BuildRequires: python-PyAudio -BuildRequires: python-setuptools -BuildRequires: python-simplejson -BuildRequires: shared-mime-info -Requires: python-send2trash -Requires: python-sip -Requires: python-qt4 -Requires: python-beautifulsoup -Requires: python-httplib2 -Suggests: MPlayer +BuildRequires: python3-Markdown +BuildRequires: python3-PyAudio +BuildRequires: python3-Send2Trash +BuildRequires: python3-devel +BuildRequires: python3-beautifulsoup4 +BuildRequires: python3-decorator +BuildRequires: python3-qt5-devel +BuildRequires: python3-requests +Requires: python3-Markdown +Requires: python3-PyAudio +Requires: python3-Send2Trash +Requires: python3-beautifulsoup4 +Requires: python3-decorator +Requires: python3-qt5 +Requires: python3-requests +Suggests: mpv Suggests: lame Suggests: sox BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Anki is a spaced repetition system (SRS). It helps you remember things by @@ -87,9 +85,8 @@ %prep %setup -q -%patch0 -%patch1 -%patch2 +%patch1 -p1 +%patch2 -p1 # SED-FIX-OPENSUSE -- Don't check for new updates. sed -i -e 's|updates=True|updates=False|; @@ -103,8 +100,8 @@ %build ./tools/build_ui.sh -python -m compileall . -python -O -m compileall . +python3 -m compileall . +python3 -O -m compileall . %install %make_install @@ -113,6 +110,17 @@ mkdir -p %{buildroot}%{_datadir}/appdata install -m 0644 %{S:1} %{buildroot}%{_datadir}/appdata +# install mime data +mkdir -p %{buildroot}%{_datadir}/mime/packages/ +install -m 0644 %{name}.xml %{buildroot}%{_datadir}/mime/packages/ + +# Remove duplicate and unneeded doc files +rm %{buildroot}%{_datadir}/doc/anki/LICENSE +rm %{buildroot}%{_datadir}/doc/anki/LICENSE.logo +rm %{buildroot}%{_datadir}/doc/anki/README.contributing +rm %{buildroot}%{_datadir}/doc/anki/README.development +rm %{buildroot}%{_datadir}/doc/anki/README.md + %find_lang %{name} %{name}.lang %if 0%{?suse_version} @@ -120,12 +128,14 @@ %fdupes -s %{buildroot}%{_prefix} %endif +# Fix rpmlint issues +find %{buildroot}%{_datadir}/%{name}/web/ -name '*.js' -exec chmod a-x {} \; +sed -i 's|/usr/bin/env python3|%__python3|' %{buildroot}%{_bindir}/%{name} + %check %if %{with tests} # to prevent Exception("Anki requires a UTF-8 locale.") export LC_ALL=en_US.UTF-8 -# tests expecting remote connection can't be run inside OBS -rm tests/test_sync.py tests/test_remote_sync.py tests/test_media.py ./tools/tests.sh %endif @@ -136,13 +146,12 @@ update-mime-database %{_datadir}/mime %files -f %{name}.lang -%defattr(-,root,root) -%doc LICENSE LICENSE.logo README +%doc README.md +%license LICENSE LICENSE.logo %{_bindir}/%{name} %{_mandir}/man1/%{name}.1%{ext_man} %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.* -%{_datadir}/appdata %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/mime/packages/%{name}.xml %{_datadir}/%{name} ++++++ anki-2.0.47-source.tgz -> anki-2.1.0-source.tgz ++++++ ++++ 71967 lines of diff (skipped) ++++++ anki-anki_lang.py.patch ++++++ --- /var/tmp/diff_new_pack.SOLXJo/_old 2018-08-24 17:03:41.818042412 +0200 +++ /var/tmp/diff_new_pack.SOLXJo/_new 2018-08-24 17:03:41.818042412 +0200 @@ -1,17 +1,19 @@ ---- anki/lang.py.sav 2017-02-10 14:26:27.000000000 +0900 -+++ anki/lang.py 2017-03-28 18:04:42.985569721 +0900 -@@ -71,15 +71,7 @@ - return localTranslation().ungettext(single, plural, n) +--- a/anki/lang.py ++++ b/anki/lang.py +@@ -78,17 +78,7 @@ + return localTranslation().ngettext(single, plural, n) def langDir(): -- dir = os.path.join(os.path.dirname( -- os.path.abspath(__file__)), "locale") +- from anki.utils import isMac +- filedir = os.path.dirname(os.path.abspath(__file__)) +- if isMac: +- dir = os.path.abspath(filedir + "/../../Resources/locale") +- else: +- dir = os.path.join(filedir, "locale") - if not os.path.isdir(dir): - dir = os.path.join(os.path.dirname(sys.argv[0]), "locale") - if not os.path.isdir(dir): - dir = "/usr/share/anki/locale" -- if not os.path.isdir(dir): -- dir = "/usr/local/share/anki/bin/locale" - return dir + return "/usr/share/locale" ++++++ anki-aqt___init__.py.patch ++++++ --- /var/tmp/diff_new_pack.SOLXJo/_old 2018-08-24 17:03:41.830042426 +0200 +++ /var/tmp/diff_new_pack.SOLXJo/_new 2018-08-24 17:03:41.830042426 +0200 @@ -1,11 +1,11 @@ ---- aqt/__init__.py.sav 2016-02-04 07:51:40.000000000 +0100 -+++ aqt/__init__.py 2016-07-13 19:42:39.884160357 +0200 +--- a/aqt/__init__.py ++++ b/aqt/__init__.py @@ -107,7 +107,7 @@ def setupLang(pm, app, force=None): app.setLayoutDirection(Qt.LeftToRight) # qt _qtrans = QTranslator() - if _qtrans.load("qt_" + lang, dir): -+ if _qtrans.load("qt_" + lang, "/usr/share/qt4/translations"): ++ if _qtrans.load("qt_" + lang, "/usr/share/qt5/translations"): app.installTranslator(_qtrans) # App initialisation ++++++ anki.appdata.xml ++++++ --- /var/tmp/diff_new_pack.SOLXJo/_old 2018-08-24 17:03:41.838042436 +0200 +++ /var/tmp/diff_new_pack.SOLXJo/_new 2018-08-24 17:03:41.842042441 +0200 @@ -31,6 +31,6 @@ <screenshot width="1200" height="675">http://chkr.fedorapeople.org/screenshots/anki/anki-browser.png</screenshot> <screenshot width="1200" height="675">http://chkr.fedorapeople.org/screenshots/anki/anki-statistics.png</screenshot> </screenshots> - <url type="homepage">http://ankisrs.net/</url> + <url type="homepage">https://apps.ankiweb.net/</url> <updatecontact>chkr@fedoraproject.org</updatecontact> </application>