[cdcollect] - updated the supported arch list - switch to Mono.Data.Sqlite bindings

[Dan Horák]

commit fa2327297c7edc54fdd2775725ff01c8fa2e1598
Author: Dan Horák <dan at danny.cz>
Date:   Sat Jan 1 12:55:51 2011 +0100

    - updated the supported arch list
    - switch to Mono.Data.Sqlite bindings

 cdcollect-0.6.0-sqlite.patch |   74 ++++++++++++++++++++++++++++++++++++++++++
 cdcollect.spec               |   10 ++++-
 2 files changed, 82 insertions(+), 2 deletions(-)
---
diff --git a/cdcollect-0.6.0-sqlite.patch b/cdcollect-0.6.0-sqlite.patch
new file mode 100644
index 0000000..3e3eb99
--- /dev/null
+++ b/cdcollect-0.6.0-sqlite.patch
@@ -0,0 +1,74 @@
+diff -up cdcollect-0.6.0/src/CDIcon.cs.sqlite cdcollect-0.6.0/src/CDIcon.cs
+--- cdcollect-0.6.0/src/CDIcon.cs.sqlite	2006-11-24 18:12:13.000000000 +0100
++++ cdcollect-0.6.0/src/CDIcon.cs	2011-01-01 12:15:13.000000000 +0100
+@@ -23,7 +23,7 @@ using System.IO;
+ using System.Xml;
+ using Gtk;
+ using Gdk;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ 
+ 
+diff -up cdcollect-0.6.0/src/CDItem.cs.sqlite cdcollect-0.6.0/src/CDItem.cs
+--- cdcollect-0.6.0/src/CDItem.cs.sqlite	2006-11-24 18:12:13.000000000 +0100
++++ cdcollect-0.6.0/src/CDItem.cs	2011-01-01 12:15:13.000000000 +0100
+@@ -24,7 +24,7 @@ using System.Xml;
+ using System.Text.RegularExpressions;
+ using Gtk;
+ using Gdk;
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ 
+ public enum CDItemFind : int {
+diff -up cdcollect-0.6.0/src/DBsql.cs.sqlite cdcollect-0.6.0/src/DBsql.cs
+--- cdcollect-0.6.0/src/DBsql.cs.sqlite	2006-11-24 18:12:13.000000000 +0100
++++ cdcollect-0.6.0/src/DBsql.cs	2011-01-01 12:26:53.000000000 +0100
+@@ -27,7 +27,7 @@ using System.Text;
+ using System.Threading;
+ using System.Text.RegularExpressions;
+ 
+-using Mono.Data.SqliteClient;
++using Mono.Data.Sqlite;
+ using Mono.Unix;
+ 
+ 
+@@ -958,10 +958,10 @@ public class CDDatabaseSql
+ 	private int sql_command_id (string comm)
+ 	{	
+ 		IDbCommand command = sqlite_connection.CreateCommand ();
+-		command.CommandText = comm;
+-		command.ExecuteScalar ();
++		command.CommandText = comm + "; SELECT last_insert_rowid();";
++		int rowid = (int)command.ExecuteScalar ();
+ 		command.Dispose ();
+-		return (((SqliteConnection)sqlite_connection).LastInsertRowId);
++		return (rowid);
+ 	}
+ 	
+ 	private void sql_command (string comm)
+diff -up cdcollect-0.6.0/src/Makefile.am.sqlite cdcollect-0.6.0/src/Makefile.am
+--- cdcollect-0.6.0/src/Makefile.am.sqlite	2011-01-01 12:15:13.000000000 +0100
++++ cdcollect-0.6.0/src/Makefile.am	2011-01-01 12:15:13.000000000 +0100
+@@ -42,7 +42,7 @@ Defines.cs: Defines.cs.in
+ 
+ ASSEMBLIES =                    \
+ 	/r:System.Data				\
+-	/r:Mono.Data.SqliteClient	\
++	/r:Mono.Data.Sqlite	\
+ 	/r:Mono.Posix		        \
+ 	-pkg:gtk-sharp-2.0			\
+ 	-pkg:glade-sharp-2.0		\
+diff -up cdcollect-0.6.0/src/Makefile.in.sqlite cdcollect-0.6.0/src/Makefile.in
+--- cdcollect-0.6.0/src/Makefile.in.sqlite	2011-01-01 12:15:13.000000000 +0100
++++ cdcollect-0.6.0/src/Makefile.in	2011-01-01 12:15:13.000000000 +0100
+@@ -254,7 +254,7 @@ GENERATED_CSFILES = \
+ 
+ ASSEMBLIES = \
+ 	/r:System.Data				\
+-	/r:Mono.Data.SqliteClient	\
++	/r:Mono.Data.Sqlite	\
+ 	/r:Mono.Posix		        \
+ 	-pkg:gtk-sharp-2.0			\
+ 	-pkg:glade-sharp-2.0		\
diff --git a/cdcollect.spec b/cdcollect.spec
index 0afef7b..7867e07 100644
--- a/cdcollect.spec
+++ b/cdcollect.spec
@@ -3,7 +3,7 @@
 
 Name:		cdcollect
 Version:	0.6.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:	Simple CD/DVD catalog for GNOME
 
 Group:		Applications/Productivity
@@ -13,6 +13,7 @@ Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:		cdcollect-libdir.patch
 Patch1:		cdcollect-0.6.0.patch
+Patch2:		cdcollect-0.6.0-sqlite.patch
 
 BuildRequires:	mono-devel >= 1.1.17, gtk-sharp2-devel >= 2.8.0, gnome-sharp-devel
 BuildRequires:	glib2-devel, sqlite-devel >= 3.3.5, mono-data-sqlite, gettext
@@ -25,7 +26,7 @@ Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-ExcludeArch:    sparc64
+ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x
 
 %description
 CDCollect is a simple CD/DVD catalog for GNOME written in C# using Mono
@@ -36,6 +37,7 @@ and GTK#. All data are stored in a sqlite database.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -b .sqlite
 
 
 %build
@@ -92,6 +94,10 @@ fi
 
 
 %changelog
+* Sat Jan  1 2011 Dan Horák <dan[at]danny.cz> 0.6.0-11
+- updated the supported arch list
+- switch to Mono.Data.Sqlite bindings
+
 * Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.0-10
 - ExcludeArch sparc64  no mono there