From 1d0c0cc3d2efc28e90a71eee52eae3bcbfa124ad Mon Sep 17 00:00:00 2001 From: chkr Date: Feb 19 2010 22:08:54 +0000 Subject: - Update to new upstream version - Remove example files from upstream tarball due to unknown license - Updated noupdate patch --- diff --git a/.cvsignore b/.cvsignore index 90d7bfe..177f3d9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -anki-20100120.tgz +anki-0.9.9.8.6-nosamples.tgz diff --git a/anki-0.9.9.7.8-noupdate.patch b/anki-0.9.9.7.8-noupdate.patch deleted file mode 100644 index ddc411b..0000000 --- a/anki-0.9.9.7.8-noupdate.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr anki-0.9.9.7.8.old/ankiqt/config.py anki-0.9.9.7.8/ankiqt/config.py ---- anki-0.9.9.7.8.old/ankiqt/config.py 2009-05-06 08:35:07.000000000 +0200 -+++ anki-0.9.9.7.8/ankiqt/config.py 2009-05-06 21:27:39.000000000 +0200 -@@ -45,7 +45,7 @@ - 'syncOnLoad': True, - 'syncOnClose': True, - 'syncInMsgBox': False, -- 'checkForUpdates': True, -+ 'checkForUpdates': False, - 'interfaceLang': "", - 'syncUsername': "", - 'syncPassword': "", diff --git a/anki-0.9.9.8.6-noupdate.patch b/anki-0.9.9.8.6-noupdate.patch new file mode 100644 index 0000000..05bdc2f --- /dev/null +++ b/anki-0.9.9.8.6-noupdate.patch @@ -0,0 +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 +@@ -43,7 +43,7 @@ + fields = { + 'addZeroSpace': False, + 'alternativeTheme': False, +- 'checkForUpdates': True, ++ 'checkForUpdates': False, + 'created': time.time(), + 'deckBrowserNameLength': 30, + 'deckBrowserOrder': 0, diff --git a/anki.spec b/anki.spec index 31e1746..18eefc5 100644 --- a/anki.spec +++ b/anki.spec @@ -1,14 +1,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} - -%global gitdate 20100120 -%global libanki_gitcommit 33aede4d566a91ff3c57b9e892ca1a9ce03a9ae5 -%global ankiqt_gitcommit a3b3e7312a2f99ac98762c8d16a6dbf884bd2157 - Name: anki -Version: 0.9.9.8.5 -#Release: 2%{?dist} -Release: 3.git%{gitdate}%{?dist} +Version: 0.9.9.8.6 +Release: 1%{?dist} Summary: Flashcard program for using space repetition learning Group: Amusements/Games @@ -16,21 +10,24 @@ Group: Amusements/Games # was created out of Unihan.txt from www.unicode.org (MIT license) License: GPLv3+ and MIT URL: http://www.ichi2.net/anki -# based on libdrm's make-git-snapshot.sh -# sh anki-make-git-snapshot.sh -#Source0: http://ichi2.net/anki/download/files/%{name}-%{version}.tgz -Source0: %{name}-%{gitdate}.tgz +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 # Config change: don't check for new updates. -Patch0: anki-0.9.9.7.8-noupdate.patch +Patch0: anki-0.9.9.8.6-noupdate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, python-setuptools, python-sqlalchemy -BuildRequires: PyQt4-devel BuildRequires: desktop-file-utils Requires: qt4, PyQt4 Requires: python-sqlalchemy, python-simplejson, python-sqlite2 Requires: python-matplotlib -Requires: pygame +Requires: pygame, python-BeautifulSoup BuildArch: noarch %description @@ -39,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 -%setup -q -n %{name}-%{gitdate} +%setup -q %patch0 -p1 -b .noupdate -sed -i -e 's/5 (snapshot)/5.99/' ankiqt/__init__.py -sed -i -e 's/5 (snapshot)/5.99/' libanki/anki/__init__.py - %build pushd libanki %{__python} setup.py build popd -tools/build_ui.sh + %{__python} setup.py build @@ -87,7 +80,7 @@ rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) -#%doc ChangeLog +%doc ChangeLog %doc COPYING CREDITS README* # libankiqt %dir %{python_sitelib}/ankiqt @@ -114,6 +107,11 @@ rm -rf %{buildroot} %{_datadir}/pixmaps/%{name}.png %changelog +* Fri Feb 19 2010 Christian Krause - 0.9.9.8.6-1 +- Update to new upstream version +- Remove example files from upstream tarball due to unknown license +- Updated noupdate patch + * Wed Jan 20 2010 Christian Krause - 0.9.9.8.5-3.git20100120 - Update to git snapshot - Includes fix for BZ 546331 diff --git a/generate-anki-tarball.sh b/generate-anki-tarball.sh new file mode 100755 index 0000000..9a261a7 --- /dev/null +++ b/generate-anki-tarball.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +VERSION=$1 + +tar -xzvf anki-$VERSION.tgz +rm -rf anki-$VERSION/libanki/tests/importing/*.xml + +tar -czvf anki-$VERSION-nosamples.tgz anki-$VERSION + diff --git a/sources b/sources index aad57ff..4fd63b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e3d2ebc233648979823ef32fe0e9ce65 anki-20100120.tgz +919c9c2cfb55507a7406e829e85ff71a anki-0.9.9.8.6-nosamples.tgz