Update to new upstream version 2.1.15 (BZ 1744359)

Remove obsolete requirement python3-qt5-webkit
Update to new upstream patch version 2.1.14 (BZ 1724384)
2019-08-25 13:34:37 +02:00 · 2019-07-07 10:03:43 +00:00 · 2019-06-06 22:31:51 +02:00
5 changed files with 50 additions and 119 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,37 +1,2 @@
-anki-0.9.9.8.6-nosamples.tgz
-anki-1.0.tgz
-anki-1.0.1.tgz
-/anki-1.1.0.tgz
-/anki-1.1.3.tgz
-/anki-1.1.10.tgz
-/anki-1.2.2.tgz
-/anki-1.2.4.tgz
-/anki-1.2.5.tgz
-/anki-1.2.6.tgz
-/anki-1.2.7.tgz
-/anki-1.2.8.tgz
-/anki-1.2.9.tgz
-/anki-1.2.11.tgz
-/anki-2.0.4.tgz
-/anki-2.0.6.tgz
-/anki-2.0.7.tgz
-/anki-2.0.8.tgz
-/anki-2.0.9.tgz
-/anki-2.0.11.tgz
-/anki-2.0.12.tgz
-/anki-2.0.13.tgz
-/anki-2.0.16.tgz
-/anki-2.0.18.tgz
-/anki-2.0.20.tgz
-/anki-2.0.22.tgz
-/anki-2.0.25.tgz
-/anki-2.0.26.tgz
-/anki-2.0.28.tgz
-/anki-2.0.31.tgz
-/anki-2.0.32.tgz
-/anki-2.0.33.tgz
-/anki-2.0.36.tgz
-/anki-2.0.39-source.tgz
-/anki-2.0.43-source.tgz
-/anki-2.0.50-source.tgz
-/anki-2.0.52-source.tgz
+/anki-2.1.14-source.tgz
+/anki-2.1.15-source.tgz
--- a/anki-2.0.50-use-python2-shebang.patch
+++ b/anki-2.0.50-use-python2-shebang.patch
@ -1,18 +0,0 @@
-diff -uNr anki-2.0.50.old/anki/anki anki-2.0.50/anki/anki
--- anki-2.0.50.old/anki/anki	2016-05-12 04:40:52.000000000 +0200
-+++ anki-2.0.50/anki/anki	2018-04-11 00:59:13.901232410 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python2
- 
- import os, sys
- # system-wide install
-diff -uNr anki-2.0.50.old/runanki anki-2.0.50/runanki
--- anki-2.0.50.old/runanki	2016-03-21 08:28:07.000000000 +0100
-+++ anki-2.0.50/runanki	2018-04-11 00:58:54.213952994 +0200
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/python2
- 
- import sys
- sys.path.insert(0, "/usr/share/anki")
--- a/anki-2.0.50-use-system-certificates.patch
+++ b/anki-2.0.50-use-system-certificates.patch
@ -1,12 +0,0 @@
-diff -uNr anki-2.0.50.old/anki/sync.py anki-2.0.50/anki/sync.py
--- anki-2.0.50.old/anki/sync.py	2017-08-27 03:51:01.000000000 +0200
-+++ anki-2.0.50/anki/sync.py	2018-04-11 00:30:32.785697476 +0200
-@@ -52,7 +52,7 @@
-             if not os.path.exists(certs):
-                 assert 0, "Your distro has not packaged Anki correctly."
-     return httplib2.Http(
-        timeout=HTTP_TIMEOUT, ca_certs=certs,
-+        timeout=HTTP_TIMEOUT,
-         proxy_info=HTTP_PROXY,
-         disable_ssl_certificate_validation=not not HTTP_PROXY)
- 
--- a/anki.spec
+++ b/anki.spec
@ -1,35 +1,27 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+Name: anki
+Version: 2.1.15
+Release: 1%{?dist}
+Summary: Flashcard program for using space repetition learning

-Name:		anki
-Version:	2.0.52
-Release:	2%{?dist}
-Summary:	Flashcard program for using space repetition learning
-
-Group:		Amusements/Games
-License:	AGPLv3+ and GPLv3+ and MIT and BSD
-URL:		https://apps.ankiweb.net/
-Source0:	https://apps.ankiweb.net/downloads/current/anki-%{version}-source.tgz
-Source1:	anki.svg
-Source2:	anki.appdata.xml
+License: AGPLv3+ and GPLv3+ and LGPLv3 and MIT and BSD and ASL 2.0 and CC-BY-SA and CC-BY
+URL: https://apps.ankiweb.net/
+Source0: https://apps.ankiweb.net/downloads/current/anki-%{version}-source.tgz
+Source1: anki.svg
+Source2: anki.appdata.xml

 # Config change: don't check for new updates.
-Patch0:		anki-2.0.3-noupdate.patch
-# The supplied CA store does not include the root CAs for the
-# add-ons server when SNI is used by python's httplib2
-Patch1:		anki-2.0.50-use-system-certificates.patch
-# Use /usr/bin/python2 as shebang as required by
-# https://fedoraproject.org/wiki/Packaging:Python
-Patch2:		anki-2.0.50-use-python2-shebang.patch
-BuildRequires:	python2-devel, python-setuptools, python-sqlalchemy
-BuildRequires:	desktop-file-utils, PyQt4, python-simplejson
+Patch0: anki-2.0.3-noupdate.patch
+BuildRequires: python3-devel, python3-setuptools
+%global __python %{__python3}
+BuildRequires: desktop-file-utils, libappstream-glib
+BuildRequires: python3-simplejson
 Requires:	hicolor-icon-theme
-Requires:	qt4, PyQt4, PyQt4-webkit
-Requires:	python-sqlalchemy, python-simplejson
-Requires:	python-matplotlib
-Requires:	python2-send2trash
-Requires:	pygame, python-BeautifulSoup, python-httplib2
-Requires:	pyaudio, sox
-BuildArch:	noarch
+Requires:	python3-qt5, python3-qt5-webengine
+Requires:	python3-sqlalchemy, python3-simplejson, python3-matplotlib
+Requires: python3-decorator, python3-markdown, python3-send2trash
+Requires:	python3-requests, python3-pygame, python3-beautifulsoup4
+Requires:	python3-httplib2, python3-pyaudio, python3-jsonschema, sox
+BuildArch: noarch

 %description
 Anki is a program designed to help you remember facts (such as words
@ -38,23 +30,13 @@ as possible. Anki is based on a theory called spaced repetition.

 %prep
 %autosetup -p 1
-rm -rf thirdparty

 %build

 %install
-mkdir -p %{buildroot}%{_datadir}/%{name}
-cp -R aqt %{buildroot}%{_datadir}/%{name}/
-cp -R designer %{buildroot}%{_datadir}/%{name}/
-cp -R anki %{buildroot}%{_datadir}/%{name}/
-cp -R locale %{buildroot}%{_datadir}/%{name}/
-
-install -d %{buildroot}%{_bindir}
-install -m 755 runanki %{buildroot}%{_bindir}/anki
-
-install -d %{buildroot}%{_pkgdocdir}
-install -m 644 LICENSE* %{buildroot}%{_pkgdocdir}/
-install -m 644 README* %{buildroot}%{_pkgdocdir}/
+DESTDIR=%{buildroot} make install
+# Use only SVG icon
+rm -rf %{buildroot}%{_datadir}/pixmaps

 install -d %{buildroot}%{_datadir}/mime/packages
 install -m 644 anki.xml %{buildroot}%{_datadir}/mime/packages
@ -62,11 +44,9 @@ install -m 644 anki.xml %{buildroot}%{_datadir}/mime/packages
 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/
-
-mkdir -p %{buildroot}%{_datadir}/appdata
-install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/appdata/
+mkdir -p %{buildroot}%{_metainfodir}
+install -m 644 %{SOURCE2} %{buildroot}%{_metainfodir}
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml

 desktop-file-install \
  --remove-category=KDE \
@ -77,7 +57,7 @@ desktop-file-install \
 find %{buildroot} -type f -o -type l|sed '
 s:'"%{buildroot}"'::
 s:\(.*/share/anki/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
-s:\(.*/share/anki/locale/qt_\)\([^.]\+\)\(\.qm\):%lang(\2) \1\2\3:
+s:\(.*/share/anki/locale/qt\)\([^.]\+\)\(\.qm\):%lang(\2) \1\2\3:
 s:^\([^%].*\)::
 s:%lang(C) ::
 /^$/d' > anki.lang
@ -86,20 +66,36 @@ find %{buildroot}/usr/share/anki/locale -type d|sed '
 s:'"%{buildroot}"'::
 s:\(.*\):%dir \1:' >>anki.lang

+# Remove license files from docdir, they will be copied to separately via %%license
+rm -f %{buildroot}%{_pkgdocdir}/LICENSE*
+
 %files -f %{name}.lang
-%doc LICENSE* README*
+%license LICENSE*
+%doc README*
 %{_bindir}/anki
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/aqt/
-%{_datadir}/%{name}/designer/
+%{_datadir}/%{name}/web/
 %{_datadir}/%{name}/anki/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.*
 %{_datadir}/mime/packages/anki.xml
 %{_mandir}/man1/%{name}.*
-%{_datadir}/appdata/anki.appdata.xml
+%{_metainfodir}/anki.appdata.xml

 %changelog
+* Fri Aug 23 2019 Christian Krause <chkr@fedoraproject.org> - 2.1.15-1
+- Update to new upstream version 2.1.15 (BZ 1744359)
+- Remove obsolete requirement python3-qt5-webkit
+
+* Sat Jul 06 2019 Thomas Drake-Brockman <thom@sfedb.com> - 2.1.14-1
+- Update to new upstream patch version 2.1.14 (BZ 1724384)
+- Tweaked spec file
+
+* Thu Jun 06 2019 Christian Krause <chkr@fedoraproject.org> - 2.1.13-1
+- Update to new major upstream version 2.1.13 (BZ 1612847)
+- Spec file cleanup
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.52-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

@ -330,7 +326,7 @@ s:\(.*\):%dir \1:' >>anki.lang
 - Update to new upstream version 0.9.9.7.9b to fix a syncing bug

 * Tue May 12 2009 Christian Krause <chkr@fedoraproject.org> - 0.9.9.7.9-1
- Update to new upstream version 0.9.9.7.9 to fix an update problem of the 
+- Update to new upstream version 0.9.9.7.9 to fix an update problem of the
 statusbar and of the titlebar

 * Thu May 07 2009 Christian Krause <chkr@fedoraproject.org> - 0.9.9.7.8-2
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (anki-2.0.52-source.tgz) = 5130f6a90860d7e4de6cbf4401ab61c841e3d27cbcb2f62b45f807902e332e37fd7892a8688ad92ef1fae62360076530f480dfd6396b1cc0289ca8a52019ef05
+SHA512 (anki-2.1.15-source.tgz) = f3acfa6ff62d43fa461efddd81a8570304ada53b97bd494fdbbe0a0439700d7a52aa62ead31cbaed731be0df96a6cc845a7cf92dcf65f3080dc63282fe5941c3
Author	SHA1	Message	Date
Christian Krause	5da08af0e7	Update to new upstream version 2.1.15 (BZ 1744359) Remove obsolete requirement python3-qt5-webkit	2019-08-25 13:34:37 +02:00
Thomas Drake-Brockman	25ef68c7c0	Update to new upstream patch version 2.1.14 (BZ 1724384) Tweaked spec file	2019-07-07 10:03:43 +00:00
Christian Krause	d5c0ffac4f	Update to new major upstream version 2.1.13 (BZ 1612847) Spec file cleanup	2019-06-06 22:31:51 +02:00