From 90f8b587631139df76760ebe060a1970682083d6 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Jul 02 2012 19:48:50 +0000 Subject: Update to new upstream version 1.2.11 (BZ 819821) - Remove patch (issue was fixed upstream) --- diff --git a/.gitignore b/.gitignore index 82dda3c..1f67c0d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ anki-1.0.1.tgz /anki-1.2.7.tgz /anki-1.2.8.tgz /anki-1.2.9.tgz +/anki-1.2.11.tgz diff --git a/anki-1.2.9-unicode.patch b/anki-1.2.9-unicode.patch deleted file mode 100644 index adbb8e4..0000000 --- a/anki-1.2.9-unicode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr anki-1.2.9.old/libanki/anki/deck.py anki-1.2.9/libanki/anki/deck.py ---- anki-1.2.9.old/libanki/anki/deck.py 2011-06-29 03:30:56.000000000 +0200 -+++ anki-1.2.9/libanki/anki/deck.py 2011-06-30 23:30:49.800702013 +0200 -@@ -3594,7 +3594,7 @@ - sourcesTable = Table( - 'sources', metadata, - Column('id', Integer, nullable=False, primary_key=True), -- Column('name', UnicodeText, nullable=False, default=""), -+ Column('name', UnicodeText, nullable=False, default=u""), - Column('created', Float, nullable=False, default=time.time), - Column('lastSync', Float, nullable=False, default=0), - # -1 = never check, 0 = always check, 1+ = number of seconds passed. diff --git a/anki.spec b/anki.spec index 8390690..795e53a 100644 --- a/anki.spec +++ b/anki.spec @@ -1,8 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki -Version: 1.2.9 -Release: 2%{?dist} +Version: 1.2.11 +Release: 1%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games @@ -15,8 +15,6 @@ Source1: anki.svg # Config change: don't check for new updates. Patch0: anki-1.0-noupdate.patch -# Avoid unicode error message on startup -Patch1: anki-1.2.9-unicode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-setuptools, python-sqlalchemy BuildRequires: desktop-file-utils, PyQt4, python-simplejson @@ -35,7 +33,6 @@ as possible. Anki is based on a theory called spaced repetition. %prep %setup -q %patch0 -F 9 -p1 -b .noupdate -%patch1 -p1 -b .unicode %{__sed} -i -e '/^#!\//, 1d' ankiqt/ui/dropbox.py %build @@ -107,6 +104,10 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/%{name}.svg %changelog +* Sun Jul 01 2012 Christian Krause - 1.2.11-1 +- Update to new upstream version 1.2.11 (BZ 819821) +- Remove patch (issue was fixed upstream) + * Sun Jul 24 2011 Christian Krause - 1.2.9-2 - Add and install svg version of anki's icon (extracted from anki-1.2.9/icons/anki-logo.svg) diff --git a/sources b/sources index 104bea2..ccfb1b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b32c40c589565ebd5b349f8e0d36967 anki-1.2.9.tgz +dcd43787bed2dbe63ffb6d153ee9dbe5 anki-1.2.11.tgz