- Update to new upstream version

- Remove example files from upstream tarball due to unknown license - Updated noupdate patch
2010-02-21 23:54:12 +00:00 · 2010-02-21 23:54:12 +00:00 · 10f3c231ca
commit 10f3c231ca
parent 486e67d23b
6 changed files with 53 additions and 43 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1 +1 @@
-anki-0.9.9.8.5.tgz
+anki-0.9.9.8.6-nosamples.tgz
--- a/anki-0.9.9.7.8-noupdate.patch
+++ b/anki-0.9.9.7.8-noupdate.patch
@ -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': "",
--- a/anki-0.9.9.8.6-noupdate.patch
+++ 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,
--- a/anki.spec
+++ b/anki.spec
@ -1,7 +1,7 @@
 %{!?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.5
+Version:	0.9.9.8.6
 Release:	1%{?dist}
 Summary:	Flashcard program for using space repetition learning

@ -10,18 +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
-Source0:	http://ichi2.net/anki/download/files/%{name}-%{version}.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
@ -58,11 +64,19 @@ desktop-file-install \
 install -d %{buildroot}%{_datadir}/pixmaps
 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:^\([^%].*\)::
+s:%lang(C) ::
+/^$/d' > anki.lang
+
 %clean
 rm -rf %{buildroot}


-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING ChangeLog CREDITS README*
 # libankiqt
@ -78,29 +92,11 @@ rm -rf %{buildroot}

 # locale
 %dir %{python_sitelib}/ankiqt/locale/
+%dir %{python_sitelib}/ankiqt/locale/*
+%dir %{python_sitelib}/ankiqt/locale/*/LC_MESSAGES
 %dir %{python_sitelib}/anki/locale/
-%lang(cs) %{python_sitelib}/*/locale/cs*/
-%lang(de) %{python_sitelib}/*/locale/de*/
-%lang(es) %{python_sitelib}/*/locale/es*/
-%lang(fi) %{python_sitelib}/*/locale/fi*/
-%lang(fr) %{python_sitelib}/*/locale/fr*/
-%lang(it) %{python_sitelib}/*/locale/it*/
-%lang(ja) %{python_sitelib}/*/locale/ja*/
-%lang(ko) %{python_sitelib}/*/locale/ko*/
-%lang(pl) %{python_sitelib}/*/locale/pl*/
-%lang(zh) %{python_sitelib}/*/locale/zh*/
-%lang(sv) %{python_sitelib}/*/locale/sv*/
-%lang(pt) %{python_sitelib}/*/locale/pt*/
-%lang(eo) %{python_sitelib}/*/locale/eo*/
-%lang(et) %{python_sitelib}/*/locale/et*/
-%lang(nl) %{python_sitelib}/*/locale/nl*/
-%lang(ro) %{python_sitelib}/*/locale/ro*/
-%lang(ru) %{python_sitelib}/*/locale/ru*/
-%lang(mn) %{python_sitelib}/*/locale/mn*/
-%lang(nb) %{python_sitelib}/*/locale/nb*/
-%lang(he) %{python_sitelib}/*/locale/he*/
-%lang(ar) %{python_sitelib}/*/locale/ar*/
-%lang(hu) %{python_sitelib}/*/locale/hu*/
+%dir %{python_sitelib}/anki/locale/*
+%dir %{python_sitelib}/anki/locale/*/LC_MESSAGES

 %{python_sitelib}/*egg-info
 %{_bindir}/anki
@ -108,6 +104,11 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}.png

 %changelog
+* Mon Feb 22 2010 Christian Krause <chkr@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
+
 * Sun Jul 12 2009 Christian Krause <chkr@fedoraproject.org> - 0.9.9.8.5-1
 - Update to new upstream version 0.9.9.8.5
 - fix %%lang tags
--- a/generate-anki-tarball.sh
+++ 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
+
--- a/2
+++ b/2
@ -1 +1 @@
-42c8f6ba29e5052b8e3323a89b76b20b  anki-0.9.9.8.5.tgz
+919c9c2cfb55507a7406e829e85ff71a  anki-0.9.9.8.6-nosamples.tgz