[anki/f12/master] * Mon Aug 02 2010 Christian Krause <chkr at fedoraproject.org> - 1.0-1 - Update to new upstream version
chkr
chkr at fedoraproject.org
Mon Aug 2 22:11:26 UTC 2010
commit 9db3a21c12260023080fa5ee921082a66c17ce4a
Author: chkr <chkr at fedoraproject.org>
Date: Sun Jul 25 09:29:29 2010 +0000
* Mon Aug 02 2010 Christian Krause <chkr at fedoraproject.org> - 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
- Add BR python-simplejson
- Generalized generation of anki.lang to support any python 2.* release
.gitignore | 1 +
0001-Fix-crash-with-enabled-sys-tray-icon.patch | 16 --------
0001-don-t-specify-an-input-index-by-default.patch | 25 ------------
...9.8.6-noupdate.patch => anki-1.0-noupdate.patch | 8 ++--
anki.spec | 40 ++++++++-----------
sources | 2 +-
6 files changed, 23 insertions(+), 69 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 177f3d9..f3da23d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
anki-0.9.9.8.6-nosamples.tgz
+anki-1.0.tgz
diff --git a/anki-0.9.9.8.6-noupdate.patch b/anki-1.0-noupdate.patch
similarity index 50%
rename from anki-0.9.9.8.6-noupdate.patch
rename to anki-1.0-noupdate.patch
index 05bdc2f..43dc7e5 100644
--- a/anki-0.9.9.8.6-noupdate.patch
+++ b/anki-1.0-noupdate.patch
@@ -1,12 +1,12 @@
-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
+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,
- 'deckBrowserOrder': 0,
diff --git a/anki.spec b/anki.spec
index a289eb6..6d62fb5 100644
--- a/anki.spec
+++ b/anki.spec
@@ -1,33 +1,22 @@
%{!?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: 3%{?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
+BuildRequires: desktop-file-utils, PyQt4, python-simplejson
Requires: qt4, PyQt4
Requires: python-sqlalchemy, python-simplejson, python-sqlite2
Requires: python-matplotlib
@@ -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
@@ -75,8 +60,8 @@ install -m 644 icons/anki.png %{buildroot}%{_datadir}/pixmaps/
find %{buildroot} -type f -o -type l|sed '
s:'"%{buildroot}"'::
-s:\(.*/lib/python2.6/site-packages/ankiqt/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
-s:\(.*/lib/python2.6/site-packages/anki/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
+s:\(.*/lib/python2\..*/site-packages/ankiqt/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
+s:\(.*/lib/python2\..*/site-packages/anki/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:
s:^\([^%].*\)::
s:%lang(C) ::
/^$/d' > anki.lang
@@ -116,6 +101,15 @@ rm -rf %{buildroot}
%{_datadir}/pixmaps/%{name}.png
%changelog
+* Mon Aug 02 2010 Christian Krause <chkr at fedoraproject.org> - 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
+- Add BR python-simplejson
+- Generalized generation of anki.lang to support any python 2.* release
+
* Thu May 20 2010 Christian Krause <chkr at fedoraproject.org> - 0.9.9.8.6-3
- Add pyaudio as requirement for audio recording
- Add upstream patch to prevent anki hanging during audio recording
diff --git a/sources b/sources
index 4fd63b1..f9c6a85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-919c9c2cfb55507a7406e829e85ff71a anki-0.9.9.8.6-nosamples.tgz
+d09e5f38cf169eb86d473beaab9e6596 anki-1.0.tgz
More information about the scm-commits
mailing list