From 8ff6dc7ff9bf16e7e8d8fa972524d2a98701ca60 Mon Sep 17 00:00:00 2001 From: Haïkel Guémar Date: Jan 08 2011 16:31:36 +0000 Subject: drop useless patch --- diff --git a/libgda-4.2.2-sqlite-fix.patch b/libgda-4.2.2-sqlite-fix.patch deleted file mode 100644 index 2dee925..0000000 --- a/libgda-4.2.2-sqlite-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/libgda/sqlite/gda-symbols-util.c b/libgda/sqlite/gda-symbols-util.c -index ac144e1..2766237 100644 ---- a/libgda/sqlite/gda-symbols-util.c -+++ b/libgda/sqlite/gda-symbols-util.c -@@ -89,19 +89,19 @@ find_sqlite_library (const gchar *name_part) - const gchar *env; - - /* first try by 'normal' shared library finding */ -- handle = g_module_open (name_part, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); -- if (handle) { -- gpointer func; -- if (g_module_symbol (handle, "sqlite3_open", &func)) { --#ifdef GDA_DEBUG_NO -- g_print ("'%s' found using default shared library finding\n", name_part); --#endif -- return handle; -- } -+/* handle = g_module_open (name_part, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL); */ -+/* if (handle) { */ -+/* gpointer func; */ -+/* if (g_module_symbol (handle, "sqlite3_open", &func)) { */ -+/* #ifdef GDA_DEBUG_NO */ -+/* g_print ("'%s' found using default shared library finding\n", name_part); */ -+/* #endif */ -+/* return handle; */ -+/* } */ - -- g_module_close (handle); -- handle = NULL; -- } -+/* g_module_close (handle); */ -+/* handle = NULL; */ -+/* } */ - - /* first, use LD_LIBRARY_PATH */ - env = g_getenv ("LD_LIBRARY_PATH"); diff --git a/libgda.spec b/libgda.spec index 3923169..cb10665 100644 --- a/libgda.spec +++ b/libgda.spec @@ -20,7 +20,7 @@ Name: libgda Epoch: 1 Version: 4.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for writing gnome database programs Group: System Environment/Libraries License: LGPLv2+ @@ -28,7 +28,6 @@ URL: http://www.gnome-db.org/ Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/4.0/%{name}-%{version}.tar.bz2 Patch1: libgda-3.0.0-man.patch Patch2: libgda-3.99.8-lib64.patch -Patch3: libgda-4.2.2-sqlite-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 0.8 BuildRequires: glib2-devel >= 2.16 @@ -251,7 +250,6 @@ This package includes the pkgconfig file for the libgda Java JDBC provider. %setup -q %patch1 -p1 -b .man %patch2 -p1 -b .lib64 -%patch3 -p1 -b .fix # need to reconfigure autotools scripts against newer toolchain autoreconf -fi @@ -325,7 +323,7 @@ rm -rf $RPM_BUILD_ROOT %files -f libgda-4.0.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLg README NEWS +%doc AUTHORS COPYING ChangeLog README NEWS %config(noreplace) %{_sysconfdir}/libgda-4.0 %{_bindir}/gda-list-*-4.0 %{_bindir}/gda-sql-4.0 @@ -478,6 +476,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 8 2011 - 1:4.2.2-2 +- drop sqlite patch: should be fixed in latest xulrunner package + * Tue Nov 30 2010 Haïkel Guémar - 1:4.2.2-1 - Upstream 4.2.2 - Cleaned spec from deprecated providers support