Compare commits

...
This repository has been archived on 2026-01-16. You can view files and clone it, but you cannot make any changes to its state, such as pushing and creating new issues, pull requests or comments.

1 commit

Author SHA1 Message Date
Christian Krause
45b991e68c Update to new upstream version 2.0.50 (BZ 1436178, BZ 1529540, BZ 1529541)
Use separate send2trash python module instead of the bundled one (BZ 1173410)
Disable internal CA store in favor of global one (BZ 1497504)
Use correct shebang for python2 (BZ 1478302)
Use %autosetup
2018-04-12 00:45:00 +02:00
5 changed files with 46 additions and 7 deletions

1
.gitignore vendored
View file

@ -33,3 +33,4 @@ anki-1.0.1.tgz
/anki-2.0.36.tgz
/anki-2.0.39-source.tgz
/anki-2.0.43-source.tgz
/anki-2.0.50-source.tgz

View file

@ -0,0 +1,18 @@
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")

View file

@ -0,0 +1,12 @@
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)

View file

@ -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.43
Version: 2.0.50
Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning
@ -14,6 +14,12 @@ 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
Requires: hicolor-icon-theme
@ -30,18 +36,14 @@ and phrases in a foreign language) as easily, quickly and efficiently
as possible. Anki is based on a theory called spaced repetition.
%prep
%setup -q
%autosetup -p 1
mv thirdparty/send2trash .
rm -rf thirdparty
rm 'aqt/forms/#about.py#'
%patch0 -p1 -b .noupdate
%build
%install
mkdir -p %{buildroot}%{_datadir}/%{name}
rm -f aqt/*.noupdate
rm -f aqt/*.fix-browserview
cp -R aqt %{buildroot}%{_datadir}/%{name}/
cp -R designer %{buildroot}%{_datadir}/%{name}/
cp -R anki %{buildroot}%{_datadir}/%{name}/
@ -119,6 +121,12 @@ fi
%{_datadir}/appdata/anki.appdata.xml
%changelog
* Mon Apr 09 2018 Christian Krause <chkr@fedoraproject.org> - 2.0.50-1
- Update to new upstream version 2.0.50 (BZ 1436178, BZ 1529540, BZ 1529541)
- Disable internal CA store in favor of global one (BZ 1497504)
- Use correct shebang for python2 (BZ 1478302)
- Use %%autosetup
* Sat Feb 25 2017 Christian Krause <chkr@fedoraproject.org> - 2.0.43-1
- Update to new upstream version 2.0.43 (BZ 1406760)
- Delete backup file

View file

@ -1 +1 @@
SHA512 (anki-2.0.43-source.tgz) = e50ee4cf6fd7be266b6d38682e28a06b51cc42a2667f35fbafa755152d47bbadb2fbd2baa771d13e73f39973a4102d626fbe7327a5de05efbc3700d7a2c9909c
SHA512 (anki-2.0.50-source.tgz) = e4bd27768937534c6d94530b87269e62b348ca68b4e8cc46841ae7197bd8e02f46a6b328ff470a624ff2acdd1a61cd9435aa5dd4fecebd4fa570529c06955bc0