From bbbd4f18c2b982b36a86556cd51b434eb878b807 Mon Sep 17 00:00:00 2001 From: Christian Krause Date: Aug 02 2010 20:04:15 +0000 Subject: * Mon Aug 02 2010 Christian Krause - 1.0-1 - Update to new upstream version 1.0 - Use original upstream tgz since upstream doesn't ship the problematic example files anymore - Remove upstreamed patches - Update noupdate patch --- diff --git a/0001-Fix-crash-with-enabled-sys-tray-icon.patch b/0001-Fix-crash-with-enabled-sys-tray-icon.patch deleted file mode 100644 index 9a514fb..0000000 --- a/0001-Fix-crash-with-enabled-sys-tray-icon.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/ankiqt/ui/tray.py b/ankiqt/ui/tray.py -index 615738c..b63ef77 100644 ---- a/ankiqt/ui/tray.py -+++ b/ankiqt/ui/tray.py -@@ -29,7 +29,7 @@ class AnkiTrayIcon(QtCore.QObject): - mw.addView(self) - mw.connect(self.ti, QtCore.SIGNAL("activated(QSystemTrayIcon::ActivationReason)"),lambda i: self.activated(i)) - mw.connect(self.ti, QtCore.SIGNAL("messageClicked()"), lambda : self.messageClicked()) -- mw.connect(self.mw.app, QtCore.SIGNAL("focusChanged(QWidget*,QWidget*)"), lambda old,now: self.focusChanged(old,now)) -+ mw.connect(self.mw.app, QtCore.SIGNAL("focusChanged(QWidget*,QWidget*)"), self.focusChanged) - self.ti.show() - - def showAll(self): --- -1.6.2.5 - diff --git a/0001-don-t-specify-an-input-index-by-default.patch b/0001-don-t-specify-an-input-index-by-default.patch deleted file mode 100644 index ffa1f7e..0000000 --- a/0001-don-t-specify-an-input-index-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 554d7021e0f413186e0124a264fcb3c59ef92bad Mon Sep 17 00:00:00 2001 -From: Damien Elmes -Date: Wed, 21 Apr 2010 13:31:59 +0900 -Subject: [PATCH] don't specify an input index by default - ---- - anki/sound.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/anki/sound.py b/anki/sound.py -index 9943a83..2272bd2 100644 ---- a/anki/sound.py -+++ b/anki/sound.py -@@ -238,7 +238,7 @@ try: - PYAU_FORMAT = pyaudio.paInt16 - PYAU_CHANNELS = 1 - PYAU_RATE = 44100 -- PYAU_INPUT_INDEX = 0 -+ PYAU_INPUT_INDEX = None - except: - pass - --- -1.6.2.5 - diff --git a/anki-0.9.9.8.6-noupdate.patch b/anki-0.9.9.8.6-noupdate.patch deleted file mode 100644 index 05bdc2f..0000000 --- a/anki-0.9.9.8.6-noupdate.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr anki-0.9.9.8.6.old/ankiqt/config.py anki-0.9.9.8.6/ankiqt/config.py ---- anki-0.9.9.8.6.old/ankiqt/config.py 2010-02-12 10:01:03.000000000 +0100 -+++ anki-0.9.9.8.6/ankiqt/config.py 2010-02-19 22:46:05.000000000 +0100 -@@ -43,7 +43,7 @@ - fields = { - 'addZeroSpace': False, - 'alternativeTheme': False, -- 'checkForUpdates': True, -+ 'checkForUpdates': False, - 'created': time.time(), - 'deckBrowserNameLength': 30, - 'deckBrowserOrder': 0, diff --git a/anki-1.0-noupdate.patch b/anki-1.0-noupdate.patch new file mode 100644 index 0000000..43dc7e5 --- /dev/null +++ b/anki-1.0-noupdate.patch @@ -0,0 +1,12 @@ +diff -uNr anki-1.0.old/ankiqt/config.py anki-1.0/ankiqt/config.py +--- anki-1.0.old/ankiqt/config.py 2010-07-21 05:55:21.000000000 +0200 ++++ anki-1.0/ankiqt/config.py 2010-08-02 21:09:29.000000000 +0200 +@@ -43,7 +43,7 @@ + fields = { + 'addZeroSpace': False, + 'alternativeTheme': False, +- 'checkForUpdates': True, ++ 'checkForUpdates': False, + 'colourTimes': True, + 'created': time.time(), + 'deckBrowserNameLength': 30, diff --git a/anki.spec b/anki.spec index b78d3fa..467e716 100644 --- a/anki.spec +++ b/anki.spec @@ -1,30 +1,19 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: anki -Version: 0.9.9.8.6 -Release: 5%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games -# the file anki-%{version}/libanki/anki/features/chinese/unihan.db +# the file anki-%%{version}/libanki/anki/features/chinese/unihan.db # was created out of Unihan.txt from www.unicode.org (MIT license) License: GPLv3+ and MIT URL: http://www.ichi2.net/anki -Source0: %{name}-%{version}-nosamples.tgz -# anki contains samples with an unclear license -# this script to remove all samples since they are not installed anyway -# Download the upstream tarball and invoke this script while in the -# tarball's directory: -# sh generate-anki-tarball.sh 0.9.9.8.6 -# upstream tarball: http://anki.googlecode.com/files/%{name}-%{version}.tgz -Source1: generate-anki-tarball.sh +Source0: http://anki.googlecode.com/files/%{name}-%{version}.tgz # Config change: don't check for new updates. -Patch0: anki-0.9.9.8.6-noupdate.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=567672 -Patch1: 0001-Fix-crash-with-enabled-sys-tray-icon.patch -# Upstream patch to prevent anki hanging during audio recording -Patch2: 0001-don-t-specify-an-input-index-by-default.patch +Patch0: anki-1.0-noupdate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-setuptools, python-sqlalchemy BuildRequires: desktop-file-utils, PyQt4 @@ -43,10 +32,6 @@ as possible. Anki is based on a theory called spaced repetition. %prep %setup -q %patch0 -p1 -b .noupdate -%patch1 -p1 -b .trayicon_crash -pushd libanki -%patch2 -p1 -b .pyaudio_fix -popd %build pushd libanki @@ -116,6 +101,13 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/%{name}.png %changelog +* Mon Aug 02 2010 Christian Krause - 1.0-1 +- Update to new upstream version 1.0 +- Use original upstream tgz since upstream doesn't ship the problematic + example files anymore +- Remove upstreamed patches +- Update noupdate patch + * Sun Jul 25 2010 Christian Krause - 0.9.9.8.6-5 - Generalized generation of anki.lang to support any python 2.* release