[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-extras-commits
Subject:    [anki] Update to new upstream version 1.2.9 (BZ 717584) to fix more
From:       chkr <chkr () fedoraproject ! org>
Date:       2011-06-30 21:37:41
Message-ID: 20110630213741.9D73120245 () pkgs01 ! phx2 ! fedoraproject ! org
[Download RAW message or body]

commit a59a7d8bb73079e97a45b871a275899422a750ab
Author: Christian Krause <chkr@fedoraproject.org>
Date:   Thu Jun 30 23:37:24 2011 +0200

    Update to new upstream version 1.2.9 (BZ 717584) to fix more
    compatibility issues with python-sqlalchemy-0.7.x
    Remove upstreamed patches
    Add patch to avoid unicode error messages on startup

 .gitignore                      |    1 +
 anki-1.2.8-sqlalchemy-0.7.patch |   30 ------------------------------
 anki-1.2.9-unicode.patch        |   12 ++++++++++++
 anki.spec                       |   19 +++++++++++--------
 sources                         |    2 +-
 5 files changed, 25 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 668107b..82dda3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ anki-1.0.1.tgz
 /anki-1.2.6.tgz
 /anki-1.2.7.tgz
 /anki-1.2.8.tgz
+/anki-1.2.9.tgz
diff --git a/anki-1.2.9-unicode.patch b/anki-1.2.9-unicode.patch
new file mode 100644
index 0000000..adbb8e4
--- /dev/null
+++ b/anki-1.2.9-unicode.patch
@@ -0,0 +1,12 @@
+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 a9257d4..ba5e58a 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.8
-Release:	2%{?dist}
+Version:	1.2.9
+Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning
 
 Group:		Amusements/Games
@@ -14,9 +14,8 @@ Source0:	http://anki.googlecode.com/files/%{name}-%{version}.tgz
 
 # Config change: don't check for new updates.
 Patch0:		anki-1.0-noupdate.patch
-# https://github.com/dae/libanki/commit/0e8df85619bb0588750b20446d4d8a02de5c73cc
-# https://github.com/dae/libanki/commit/e318f7686c02d4de25804fbdaa85c07f442f80d3
-Patch1:		anki-1.2.8-sqlalchemy-0.7.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,9 +34,7 @@ as possible. Anki is based on a theory called spaced repetition.
 %prep
 %setup -q
 %patch0 -F 9 -p1 -b .noupdate
-pushd libanki
-%patch1 -p1 -b .sqlalchemy-0.7
-popd
+%patch1 -p1 -b .unicode
 %{__sed} -i -e '/^#!\//, 1d' ankiqt/ui/dropbox.py
 
 %build
@@ -109,6 +106,12 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Thu Jun 30 2011 Christian Krause <chkr@fedoraproject.org> - 1.2.9-1
+- Update to new upstream version 1.2.9 (BZ 717584) to fix more
+  compatibility issues with python-sqlalchemy-0.7.x
+- Remove upstreamed patches
+- Add patch to avoid unicode error messages on startup
+
 * Tue Jun 28 2011 Christian Krause <chkr@fedoraproject.org> - 1.2.8-2
 - Fix FTBFS issue (BZ 715813)
 - Adding two upstream patches to support python-sqlalchemy-0.7.x
diff --git a/sources b/sources
index 119eaf7..104bea2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0dc5f5bad979f57cab82e3757665f6c0  anki-1.2.8.tgz
+3b32c40c589565ebd5b349f8e0d36967  anki-1.2.9.tgz
-- 
scm-commits mailing list
scm-commits@lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/scm-commits


[prev in list] [next in list] [prev in thread] [next in thread]