rpms/anki/F-13 anki-0.9.9.8.6-noupdate.patch, NONE, 1.1 generate-anki-tarball.sh, 1.2, 1.3 .cvsignore, 1.10, 1.11 anki.spec, 1.13, 1.14 sources, 1.10, 1.11 anki-0.9.9.7.8-noupdate.patch, 1.1, NONE

[chkr]

Author: chkr

Update of /cvs/pkgs/rpms/anki/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9597

Modified Files:
	.cvsignore anki.spec sources 
Added Files:
	anki-0.9.9.8.6-noupdate.patch generate-anki-tarball.sh 
Removed Files:
	anki-0.9.9.7.8-noupdate.patch 
Log Message:
* Fri Feb 19 2010 Christian Krause <chkr at fedoraproject.org> - 0.9.9.8.6-1
- Update to new upstream version
- Remove example files from upstream tarball due to unknown license
- Updated noupdate patch


anki-0.9.9.8.6-noupdate.patch:
 config.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE anki-0.9.9.8.6-noupdate.patch ---
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,


Index: generate-anki-tarball.sh
===================================================================
RCS file: generate-anki-tarball.sh
diff -N generate-anki-tarball.sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ generate-anki-tarball.sh	19 Feb 2010 23:41:18 -0000	1.3
@@ -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
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-13/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	21 Jan 2010 00:04:35 -0000	1.10
+++ .cvsignore	19 Feb 2010 23:41:17 -0000	1.11
@@ -1 +1 @@
-anki-20100120.tgz
+anki-0.9.9.8.6-nosamples.tgz


Index: anki.spec
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-13/anki.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- anki.spec	21 Jan 2010 00:04:35 -0000	1.13
+++ anki.spec	19 Feb 2010 23:41:18 -0000	1.14
@@ -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 <libanki_gitcommit> <ankiqt_gitcommit> <gitdate>
-#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
+BuildRequires:	desktop-file-utils, PyQt4
 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 ea
 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 <chkr at fedoraproject.org> - 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 <chkr at fedoraproject.org> - 0.9.9.8.5-3.git20100120
 - Update to git snapshot
 - Includes fix for BZ 546331


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/anki/F-13/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	21 Jan 2010 00:04:35 -0000	1.10
+++ sources	19 Feb 2010 23:41:18 -0000	1.11
@@ -1 +1 @@
-e3d2ebc233648979823ef32fe0e9ce65  anki-20100120.tgz
+919c9c2cfb55507a7406e829e85ff71a  anki-0.9.9.8.6-nosamples.tgz


--- anki-0.9.9.7.8-noupdate.patch DELETED ---