- up to 0.9 stable, (brr tried to merge from DEVEL)

Changed files:
    griffith-env_python.patch -> 1.2
    griffith-plugin.patch -> 1.2
    griffith.spec -> 1.25

diff --git a/griffith-env_python.patch b/griffith-env_python.patch
index 7a2c06b0d550d5fa9f17d88f67c96b766a9d3677..1269d1aca68d6ce7676af148c014f31228fbbd76 100644 (file)
--- a/griffith-env_python.patch
+++ b/griffith-env_python.patch
@@ -1,9 +1,9 @@
-diff -Nur griffith-0.6.1.org/griffith griffith-0.6.1/griffith
---- griffith-0.6.1.org/griffith        2006-05-13 20:38:30.000000000 +0200
-+++ griffith-0.6.1/griffith    2006-05-13 20:38:41.000000000 +0200
+diff -Nur griffith-0.9.org/griffith griffith-0.9/griffith
+--- griffith-0.9.org/griffith  2007-02-20 21:04:17.000000000 +0100
++++ griffith-0.9/griffith      2007-02-20 21:05:25.000000000 +0100
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/python
- # -*- coding: ISO-8859-1 -*-
+ # -*- coding: utf-8 -*-
  
  __revision__ = '$Id$'

diff --git a/griffith-plugin.patch b/griffith-plugin.patch
index b61735ea0c4fcc9d222a9bd90d8b0d1c611b523e..a7b8776cd17b6c28cfc054c65b1a61e50cfeb9f2 100644 (file)
--- a/griffith-plugin.patch
+++ b/griffith-plugin.patch
@@ -1,7 +1,7 @@
-diff -Nur griffith-0.6.1.org/lib/gutils.py griffith-0.6.1/lib/gutils.py
---- griffith-0.6.1.org/lib/gutils.py   2006-05-28 23:51:16.000000000 +0200
-+++ griffith-0.6.1/lib/gutils.py       2006-05-28 23:54:34.000000000 +0200
-@@ -353,7 +353,7 @@
+diff -Nur griffith-0.9.org/lib/gutils.py griffith-0.9/lib/gutils.py
+--- griffith-0.9.org/lib/gutils.py     2007-02-20 21:27:11.000000000 +0100
++++ griffith-0.9/lib/gutils.py 2007-02-20 21:29:27.000000000 +0100
+@@ -299,7 +299,7 @@
  def read_plugins(prefix,directory):
        """returns available plugins"""
        import glob
@@ -10,24 +10,24 @@ diff -Nur griffith-0.6.1.org/lib/gutils.py griffith-0.6.1/lib/gutils.py
  
  def findKey(val, dict):
        for key, value in dict.items():
-diff -Nur griffith-0.6.1.org/lib/initialize.py griffith-0.6.1/lib/initialize.py
---- griffith-0.6.1.org/lib/initialize.py       2006-05-28 23:50:45.000000000 +0200
-+++ griffith-0.6.1/lib/initialize.py   2006-05-28 23:55:57.000000000 +0200
-@@ -203,7 +203,7 @@
+diff -Nur griffith-0.9.org/lib/initialize.py griffith-0.9/lib/initialize.py
+--- griffith-0.9.org/lib/initialize.py 2007-02-20 21:27:11.000000000 +0100
++++ griffith-0.9/lib/initialize.py     2007-02-20 21:29:50.000000000 +0100
+@@ -313,7 +313,7 @@
        self.d_plugin = 0
        mcounter = 0
        for p in self.plugins:
--              plugin_module = os.path.basename(p).replace(".py","")
-+              plugin_module = os.path.basename(p).replace(".pyc","")
-               plugin_name = plugin_module.replace("PluginMovie","")
-               self.am_source.append_text(plugin_name)
-               self.default_plugin.append_text(plugin_name)
-@@ -222,7 +222,7 @@
+-              plugin_module = os.path.basename(p).replace('.py','')
++              plugin_module = os.path.basename(p).replace('.pyc','')
+               plugin_name = plugin_module.replace('PluginMovie','')
+               self.widgets['add']['source'].append_text(plugin_name)
+               self.widgets['preferences']['default_plugin'].append_text(plugin_name)
+@@ -332,7 +332,7 @@
                self.locations['export_plugins'])
        plugins.sort()
        for p in plugins:
--              plugin_module = os.path.basename(p).replace(".py", "")
-+              plugin_module = os.path.basename(p).replace(".pyc", "")
-               plugin_name = plugin_module.replace("PluginExport", "")
+-              plugin_module = os.path.basename(p).replace('.py', '')
++              plugin_module = os.path.basename(p).replace('.pyc', '')
+               plugin_name = plugin_module.replace('PluginExport', '')
                menu_items = gtk.MenuItem(plugin_name)
-               self.export_menu.append(menu_items)
+               self.widgets['menu']['export'].append(menu_items)

diff --git a/griffith.spec b/griffith.spec
index f7e2fd3ccdb5d60762ac0aef37e688963f8a89a6..be091d0b517f374a1fe7204d65eb7e309368e401 100644 (file)
--- a/griffith.spec
+++ b/griffith.spec
@@ -1,18 +1,20 @@
-#
+# 
+# TODO:
+# Polish man pages are in utf-8, convert it or what?
 # Conditional build:
 %bcond_without gtkspell    # don't build with spell checker
 #
 Summary:       griffith - film collection manager
 Summary(pl.UTF-8):     griffith - program katalogujący filmy
 Name:          griffith
-Version:       0.6.2
-Release:       2
+Version:       0.9
+Release:       1
 License:       GPL v2
 Group:         X11/Applications/Multimedia
 Source0:       http://download.berlios.de/griffith/%{name}-%{version}.tar.gz
-# Source0-md5: e1366baf254c587937389f5fef728c96
-Source1:       http://download.berlios.de/griffith/%{name}-extra-artwork-0.6.tar.gz
-# Source1-md5: 83609337d721f35277c2970866dbfe7e
+# Source0-md5: 436c12cd18a038b13fc67e5e3a34162e
+Source1:       http://download.berlios.de/griffith/%{name}-extra-artwork-%{version}.tar.gz
+# Source1-md5: a3bfdf56badf97172ec83deeda7bce1e
 Source2:       %{name}.desktop
 Patch0:                %{name}-Makefile.patch
 Patch1:                %{name}-env_python.patch
@@ -31,7 +33,9 @@ Requires:     python-ReportLab
 %{?with_gtkspell:Requires: python-gnome-extras-gtkspell}
 Requires:      python-gnome-gconf
 Requires:      python-pygtk-gtk >= 2:2.6.0
-Requires:      python-sqlite1 >= 1.1.7
+Requires:      python-sqlite >= 2.0.0
+Requires:      python-SQLAlchemy
+Requires:      python-PyXML
 #Suggests:     python-gnome-extras
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -64,7 +68,7 @@ Dodatkowe pliki graficzne.
 %patch1 -p1
 %patch2 -p1
 
-mv griffith-extra-artwork-0.6/images/*.png images/
+mv griffith-extra-artwork-%{version}/images/*.png images/
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,8 +99,20 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/%{name}/lib
 %attr(755,root,root) %{_datadir}/%{name}/lib/%{name}
 %{_datadir}/%{name}/lib/*.py[co]
-%{_datadir}/%{name}/export_templates
-%{_datadir}/%{name}/glade
+%dir %{_datadir}/%{name}/export_templates
+%dir %{_datadir}/%{name}/export_templates/csv/
+%{_datadir}/%{name}/export_templates/csv/*
+%dir %{_datadir}/%{name}/export_templates/html_tables/
+%{_datadir}/%{name}/export_templates/html_tables/*
+%dir %{_datadir}/%{name}/export_templates/html_table/
+%{_datadir}/%{name}/export_templates/html_table/*
+%dir %{_datadir}/%{name}/export_templates/latex/
+%{_datadir}/%{name}/export_templates/latex/*
+%dir %{_datadir}/%{name}/export_templates/xml/
+%{_datadir}/%{name}/export_templates/xml/*
+%dir %{_datadir}/%{name}/glade
+%{_datadir}/%{name}/glade/*.glade
+%{_datadir}/%{name}/glade/*.png
 %dir %{_datadir}/%{name}/images
 %{_datadir}/%{name}/images/00.png
 %{_datadir}/%{name}/images/01.png
@@ -124,15 +140,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}/images/meter08.png
 %{_datadir}/%{name}/images/meter09.png
 %{_datadir}/%{name}/images/nill.png
-%dir %{_datadir}/%{name}/plugins
-%dir %{_datadir}/%{name}/plugins/movie
-%dir %{_datadir}/%{name}/plugins/export
-%{_datadir}/%{name}/plugins/movie/*.py[co]
-%{_datadir}/%{name}/plugins/export/*.py[co]
+%{_datadir}/%{name}/images/seen.png
+%{_datadir}/%{name}/images/unseen.png
+%dir %{_datadir}/%{name}/lib/plugins
+%dir %{_datadir}/%{name}/lib/plugins/movie
+%dir %{_datadir}/%{name}/lib/plugins/export
+%dir %{_datadir}/%{name}/lib/plugins/imp
+%{_datadir}/%{name}/lib/plugins/*.py[co]
+%{_datadir}/%{name}/lib/plugins/movie/*.py[co]
+%{_datadir}/%{name}/lib/plugins/export/*.py[co]
+%{_datadir}/%{name}/lib/plugins/imp/*.py[co]
 %{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.*
+%{_pixmapsdir}/%{name}.png
+%{_pixmapsdir}/%{name}.xpm
 %{_mandir}/*/man?/*
-%{_mandir}/man?/*
+%{_mandir}/man1/*
 
 %files extra-artwork
 %defattr(644,root,root,755)