rpms/libgda/EL-5 import.log, NONE, 1.1 libgda-3.0.0-man.patch, NONE, 1.1 libgda-3.0.1-detect-sqlite.patch, NONE, 1.1 libgda-3.0.1-ldap.patch, NONE, 1.1 libgda-3.0.1-mdb-64bit.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libgda.spec, 1.18, 1.19 sources, 1.3, 1.4 libgda-1.9.100-64bit.patch, 1.1, NONE libgda-1.9.100-configure.patch, 1.1, NONE libgda-1.9.100-sharp.patch, 1.3, NONE libgda-1.9.100-syslibs.patch, 1.2, NONE
Lubomir Rintel
lkundrak at fedoraproject.org
Mon Sep 22 19:06:49 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/libgda/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24087/EL-5
Modified Files:
.cvsignore libgda.spec sources
Added Files:
import.log libgda-3.0.0-man.patch
libgda-3.0.1-detect-sqlite.patch libgda-3.0.1-ldap.patch
libgda-3.0.1-mdb-64bit.patch
Removed Files:
libgda-1.9.100-64bit.patch libgda-1.9.100-configure.patch
libgda-1.9.100-sharp.patch libgda-1.9.100-syslibs.patch
Log Message:
Import libgda-3.0.1-6.fc9
--- NEW FILE import.log ---
libgda-3_0_1-6_fc10:EL-5:libgda-3.0.1-6.fc10.src.rpm:1222110344
libgda-3.0.0-man.patch:
--- NEW FILE libgda-3.0.0-man.patch ---
--- libgda-3.0.0/tools/gda-config-3.0.5.man 2007-04-24 09:42:36.000000000 +0200
+++ libgda-3.0.0/tools/gda-config-3.0.5 2007-04-24 09:42:05.000000000 +0200
@@ -0,0 +1,52 @@
+.\"
+.\" gda-config man page
+.\" (C) 2003 GNOME Foundation
+.\" Author:
+.\" Gonzalo Paniagua Javier (gonzalo at gnome-db.org)
+.\"
+.TH gda-config-3.0 "5" "January 2003" "libgda" "File Formats"
+.SH NAME
+$(sysconfdir)/libgda/config \- libgda global configuration file.
+$(HOME)/.libgda/config \- libgda user configuration file.
+.SH DESCRIPTION
+The config file of libgda is an XML file. The document starts with
+<libgda-config> tag, which contains sections that hold the configured
+database providers for libgda.
+.PP
+The values in the global configuration file are overriden by the ones in the
+user configuration file.
+.PP
+Each <section> has a 'path' attribute whose value \fImust\fP be something like
+"/apps/libgda/Datasources/XXXXXXXX", where XXXXXXXX is the name of the
+database backend (i.e., postgres, mysql,...)
+.PP
+Inside each <section> you can have for <entry> tags with 'name', 'type' and 'value'
+attributes. Valid values for 'name' are: \fIProvider\fP,
+\fIUsername\fP, \fIDSN\fP and \fIDescription\fP. 'type' value is always
+"string" and 'value' contains the value for the given 'name'.
+.SH EXAMPLE
+This is a sample file. You may modify it manually, add/remove sections,...
+.RS
+.sp
+.nf
+<?xml version="1.0"?>
+<libgda-config>
+ <section path="/apps/libgda/Datasources/postgres">
+ <entry name="Provider" type="string" value="PostgreSQL"/>
+ <entry name="Username" type="string" value="gonzalo"/>
+ <entry name="DSN" type="string"
+ value="DATABASE=test;USER=gonzalo"/>
+ <entry name="Description" type="string"
+ value="Mi favourite provider"/>
+ </section>
+</libgda-config>
+.fi
+.sp
+.RE
+You can also use \fBgda-config-tool-3.0\fR or \fBmergeant\fR (recommended) to modify
+this file.
+.SH SEE ALSO
+.BR mergeant (1),
+.BR gda-config-tool-3.0 (1)
+
+
--- libgda-3.0.0/tools/gda-config-tool-3.0.1.man 2007-04-24 09:42:41.000000000 +0200
+++ libgda-3.0.0/tools/gda-config-tool-3.0.1 2007-04-24 09:41:43.000000000 +0200
@@ -0,0 +1,63 @@
+.\"
+.\" gda-config-tool man page
+.\" (C) 2002 GNOME Foundation
+.\" Author:
+.\" Gonzalo Paniagua Javier (gonzalo at gnome-db.org)
+.\"
+.TH gda-config-tool-3.0 "1" "October 2002" "gda-config-tool-3.0 (libgda)" "User Commands"
+.SH NAME
+gda-config-tool-3.0 \- Tool for managing libgda configuration file.
+.SH SYNOPSIS
+.PP
+.B gda-config-tool-3.0 [OPTIONS]
+.SH DESCRIPTION
+The \fIgda-config-tool-3.0\fP program can be used create/edit/remove a libgda
+provider. It can be used both as a command line program and an interactive
+program.
+.SH OPTIONS
+.PP
+The following options are supported:
+.TP
+\fB\-?\fR, \fB\-\-help\fR
+Displays command line options.
+.TP
+\fB--usage\fR
+Display brief usage message.
+.TP
+\fB--l\fR, \fB\-\-list\-providers\fR
+Lists installed providers.
+.TP
+\fB--L\fR, \fB\-\-list\-datasources\fR
+Lists configured data sources.
+.TP
+\fB--n\fR, \fB\-\-name=NAME\fR
+User-assigned name for the provider and connection settings.
+.TP
+\fB--u\fR, \fB\-\-user=NAME\fR
+User name to pass to the provider when connecting.
+.TP
+\fB--p\fR, \fB\-\-password=NAME\fR
+Password for the given user to pass to the DB backend.
+.TP
+\fB--P\fR, \fB\-\-provider=NAME\fR
+Provider name.
+.TP
+\fB--d\fR, \fB\-\-DSN="NAME=VALUE;..."\fR
+Semi-colon separated list of parameter=value option to pass to the provider.
+.SH ENVIRONMENT VARIABLES
+.TP
+NONE
+.SH FILES
+.PP
+$(sysconfdir)/libgda/config
+.IP
+Global configurations settings read for every user.
+.PP
+${HOME}/.libgda/config
+.IP
+User settings. Override global settings.
+.SH SEE ALSO
+.BR mergeant(1),
+.BR gda-config-3.0(5)
+
+
libgda-3.0.1-detect-sqlite.patch:
--- NEW FILE libgda-3.0.1-detect-sqlite.patch ---
diff -up libgda-3.0.1/configure.in~ libgda-3.0.1/configure.in
--- libgda-3.0.1/configure.in~ 2007-08-08 11:25:16.000000000 +0200
+++ libgda-3.0.1/configure.in 2007-08-08 11:25:16.000000000 +0200
@@ -925,9 +925,10 @@ PKG_CHECK_MODULES(SQLITE, $SQLITE_MODULE
if test x"$have_sqlite" = "xyes"
then
realvers=`sqlite3 -version`
+ minorvers=`sqlite3 -version | cut -d '.' -f 2`
microvers=`sqlite3 -version | cut -d '.' -f 3`
AC_MSG_CHECKING(for sqlite version)
- if test $microvers -lt 100
+ if test $minorvers -lt 4 -a $microvers -lt 100
then
AC_MSG_RESULT(Version $realvers of SQLite does not implement required pragmas, using embedded SQLite)
have_sqlite=no
diff -up libgda-3.0.1/configure.sqlite libgda-3.0.1/configure
--- libgda-3.0.1/configure.sqlite 2007-05-04 23:42:33.000000000 +0200
+++ libgda-3.0.1/configure 2007-08-16 13:18:24.000000000 +0200
@@ -24884,10 +24884,11 @@ fi
if test x"$have_sqlite" = "xyes"
then
realvers=`sqlite3 -version`
+ minorvers=`sqlite3 -version | cut -d '.' -f 2`
microvers=`sqlite3 -version | cut -d '.' -f 3`
{ echo "$as_me:$LINENO: checking for sqlite version" >&5
echo $ECHO_N "checking for sqlite version... $ECHO_C" >&6; }
- if test $microvers -lt 100
+ if test $minorvers -lt 4 -a $microvers -lt 100
then
{ echo "$as_me:$LINENO: result: Version $realvers of SQLite does not implement required pragmas" >&5
echo "${ECHO_T}Version $realvers of SQLite does not implement required pragmas" >&6; }
libgda-3.0.1-ldap.patch:
--- NEW FILE libgda-3.0.1-ldap.patch ---
--- libgda-3.0.1/providers/ldap/gda-ldap.h~ 2007-05-27 21:03:31.000000000 +0200
+++ libgda-3.0.1/providers/ldap/gda-ldap.h 2007-05-27 21:03:31.000000000 +0200
@@ -32,6 +32,8 @@
#include <glib/gi18n-lib.h>
#include <libgda/gda-value.h>
#include "gda-ldap-provider.h"
+/* we use the old API (time to update) */
+#define LDAP_DEPRECATED 1
#include <ldap.h>
#include <ldap_schema.h>
libgda-3.0.1-mdb-64bit.patch:
--- NEW FILE libgda-3.0.1-mdb-64bit.patch ---
diff -up libgda-3.0.1/providers/mdb/gda-mdb-table.c~ libgda-3.0.1/providers/mdb/gda-mdb-table.c
--- libgda-3.0.1/providers/mdb/gda-mdb-table.c~ 2007-08-16 13:36:34.000000000 +0200
+++ libgda-3.0.1/providers/mdb/gda-mdb-table.c 2007-08-16 13:36:34.000000000 +0200
@@ -23,6 +23,7 @@
#include "gda-mdb-table.h"
#include <libgda/gda-data-model-private.h>
+#include <libgda/gda-data-model-array.h>
GdaDataModel *
gda_mdb_table_new (GdaMdbConnection *mdb_cnc, const gchar *name)
@@ -40,7 +41,7 @@ gda_mdb_table_new (GdaMdbConnection *mdb
for (i = 0; i < mdb_cnc->mdb->num_catalog; i++) {
entry = g_ptr_array_index (mdb_cnc->mdb->catalog, i);
if (entry->object_type == MDB_TABLE
- && !strcmp (entry->object_type, name))
+ && !strcmp (entry->object_name, name))
break;
else
entry = NULL;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 27 Nov 2005 20:30:33 -0000 1.3
+++ .cvsignore 22 Sep 2008 19:06:19 -0000 1.4
@@ -1 +1 @@
-libgda-1.9.100.tar.bz2
+libgda-3.0.1.tar.bz2
Index: libgda.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/libgda.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libgda.spec 29 Aug 2006 05:54:51 -0000 1.18
+++ libgda.spec 22 Sep 2008 19:06:19 -0000 1.19
@@ -1,61 +1,70 @@
-# Default provider build options (MySQL, Postgres & unixODBC)
+# Default provider build options (MySQL, Postgres, unixODBC, LDAP, FreeTDS)
#
# Package build options:
-# --with tds
# --with db2
# --with oracle
# --with sybase
-# --with mdb
# --without ldap
+# --without mdb
# --without mysql
# --without odbc
# --without postgres
+# --without tds
+# --without xbase
#
-%define FREETDS 0
%define IBMDB2 0
+%define ORACLE 0
+%define SYBASE 0
+%define LDAP 1
+%define MDB 1
%define MYSQL 1
%define ODBC 1
-%define ORACLE 0
%define POSTGRES 1
-%define SYBASE 0
-%define MDB 0
-%define LDAP 1
+%define FREETDS 1
+%define XBASE 1
-%{?_with_tds:%define FREETDS 1}
-%{?_with_db2:%define IBMDB2 1}
-%{?_with_mdb:%define MDB 1}
-%{?_with_oracle:%define ORACLE 1}
-%{?_with_sybase:%define SYBASE 1}
-%{?_without_ldap:%define LDAP 0}
+%{?_with_db2:%define IBMDB2 1}
+%{?_with_oracle:%define ORACLE 1}
+%{?_with_sybase:%define SYBASE 1}
+%{?_without_ldap:%define LDAP 0}
+%{?_without_mdb:%define MDB 0}
%{?_without_mysql:%define MYSQL 0}
-%{?_without_odbc:%define ODBC 0}
-%{?_without_postgres:%define POSTGRES 0}
+%{?_without_odbc:%define ODBC 0}
+%{?_without_postgres:%define POSTGRES 0}
+%{?_without_tds:%define FREETDS 0}
+%{?_without_xbase:%define XBASE 0}
-Summary: Library for writing gnome database programs
Name: libgda
-Version: 1.9.100
-Release: 10%{?dist}
Epoch: 1
-Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/1.9/%{name}-%{version}.tar.bz2
-URL: http://www.gnome-db.org/
+Version: 3.0.1
+Release: 6%{?dist}
+Summary: Library for writing gnome database programs
Group: System Environment/Libraries
-License: LGPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+License: LGPLv2+
+URL: http://www.gnome-db.org/
+Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
+Patch1: libgda-3.0.0-man.patch
+Patch2: libgda-3.0.1-ldap.patch
+Patch3: libgda-3.0.1-detect-sqlite.patch
+Patch4: libgda-3.0.1-mdb-64bit.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig >= 0.8
BuildRequires: glib2-devel >= 2.0.0
BuildRequires: libxslt-devel >= 1.0.9
-BuildRequires: libxml2-devel ncurses-devel sqlite-devel readline-devel
-BuildRequires: db4-devel mono-devel gtk-sharp2-devel gtk-sharp2-gapi
-BuildRequires: gamin-devel gtk-doc scrollkeeper groff gettext flex bison
-BuildRequires: intltool automake libtool
+BuildRequires: sqlite-devel >= 3.4.0
+BuildRequires: libxml2-devel readline-devel db4-devel gamin-devel
+BuildRequires: gtk-doc scrollkeeper gettext flex bison perl(XML::Parser)
+# note we do not provide these, they no longer exist
+Obsoletes: %{name}-sharp < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-sharp-devel < %{epoch}:%{version}-%{release}
%if %{FREETDS}
BuildRequires: freetds-devel
%endif
%if %{MYSQL}
-BuildRequires: mysqlclient10-devel
+BuildRequires: mysql-devel
%endif
%if %{POSTGRES}
@@ -67,17 +76,16 @@
%endif
%if %{MDB}
-BuildRequires: mdbtools-devel
+BuildRequires: mdbtools-devel
%endif
%if %{LDAP}
-BuildRequires: openldap-devel
+BuildRequires: openldap-devel
%endif
-Patch0: libgda-1.9.100-configure.patch
-Patch1: libgda-1.9.100-sharp.patch
-Patch2: libgda-1.9.100-syslibs.patch
-Patch3: libgda-1.9.100-64bit.patch
+%if %{XBASE}
+BuildRequires: xbase-devel
+%endif
%description
libgda is a library that eases the task of writing
@@ -89,137 +97,237 @@
Group: Development/Libraries
Requires: glib2-devel >= 2.0.0
Requires: libxslt-devel >= 1.0.9
-Requires: db4-devel libxml2-devel
-Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: db4-devel libxml2-devel pkgconfig
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description devel
This package contains the header files and libraries needed to write
or compile programs that use libgda.
-%package sharp
-Summary: Mono bindings for libgda
+%package sqlite
+Summary: SQLite provider for libgda
Group: System Environment/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description sharp
-This package contains the dll files needed to run (and compile) Mono
-applications which use libgda.
-
-
-%package sqlite
-Summary: libgda SQLite Provider
-Group: System Environment/Libraries
-Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release}
-Provides: gda-sqlite = %{epoch}:%{version}-%{release}
+Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release}
+Provides: gda-sqlite = %{epoch}:%{version}-%{release}
%description sqlite
This package includes the libgda SQLite provider.
+%package sqlite-devel
+Summary: SQLite provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-sqlite = %{epoch}:%{version}-%{release}
+%description sqlite-devel
+This package includes the pkgconfig file for the libgda SQLite provider.
+
%if %{FREETDS}
%package freetds
-Summary: libgda FreeTDS Provider
-Group: System Environment/Libraries
-Obsoletes: gda-freetds < %{epoch}:%{version}-%{release}
-Provides: gda-freetds = %{epoch}:%{version}-%{release}
+Summary: FreeTDS provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-freetds < %{epoch}:%{version}-%{release}
+Provides: gda-freetds = %{epoch}:%{version}-%{release}
%description freetds
This package includes the libgda FreeTDS provider.
+
+%package freetds-devel
+Summary: FreeTDS provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-freetds = %{epoch}:%{version}-%{release}
+%description freetds-devel
+This package includes the pkgconfig file for the libgda FreeTDS provider.
%endif
%if %{IBMDB2}
%package ibmdb2
-Summary: libgda IBM DB2 Provider
-Group: System Environment/Libraries
-Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release}
-Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release}
+Summary: IBM DB2 provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-ibmdb2 < %{epoch}:%{version}-%{release}
+Provides: gda-ibmdb2 = %{epoch}:%{version}-%{release}
%description ibmdb2
This package includes the libgda IBM DB2 provider.
+
+%package ibmdb2-devel
+Summary: IBM DB2 provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-ibmdb2 = %{epoch}:%{version}-%{release}
+%description ibmdb2-devel
+This package includes the pkgconfig file for the libgda IBM DB2 provider.
%endif
%if %{MYSQL}
%package mysql
-Summary: libgda MySQL Provider
-Group: System Environment/Libraries
-Obsoletes: gda-mysql < %{epoch}:%{version}-%{release}
-Provides: gda-mysql = %{epoch}:%{version}-%{release}
+Summary: MySQL provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-mysql < %{epoch}:%{version}-%{release}
+Provides: gda-mysql = %{epoch}:%{version}-%{release}
%description mysql
This package includes the libgda MySQL provider.
+
+%package mysql-devel
+Summary: MySQL provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-mysql = %{epoch}:%{version}-%{release}
+%description mysql-devel
+This package includes the pkgconfig file for the libgda MySQL provider.
%endif
%if %{ODBC}
%package odbc
-Summary: libgda ODBC Provider
-Group: System Environment/Libraries
-Obsoletes: gda-odbc < %{epoch}:%{version}-%{release}
-Provides: gda-odbc = %{epoch}:%{version}-%{release}
+Summary: ODBC provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-odbc < %{epoch}:%{version}-%{release}
+Provides: gda-odbc = %{epoch}:%{version}-%{release}
%description odbc
This package includes the libgda ODBC provider.
+
+%package odbc-devel
+Summary: ODBC provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-odbc = %{epoch}:%{version}-%{release}
+%description odbc-devel
+This package includes the pkgconfig file for the libgda ODBC provider.
%endif
%if %{ORACLE}
%package oracle
-Summary: libgda Oracle Provider
-Group: System Environment/Libraries
-Obsoletes: gda-oracle < %{epoch}:%{version}-%{release}
-Provides: gda-oracle = %{epoch}:%{version}-%{release}
+Summary: Oracle provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-oracle < %{epoch}:%{version}-%{release}
+Provides: gda-oracle = %{epoch}:%{version}-%{release}
%description oracle
This package includes the libgda Oracle provider.
+
+%package oracle-devel
+Summary: Oracle provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-oracle = %{epoch}:%{version}-%{release}
+%description oracle-devel
+This package includes the pkgconfig file for the libgda Oracle provider.
%endif
%if %{POSTGRES}
%package postgres
-Summary: libgda PostgreSQL Provider
-Group: System Environment/Libraries
-Obsoletes: gda-postgres < %{epoch}:%{version}-%{release}
-Provides: gda-postgres = %{epoch}:%{version}-%{release}
+Summary: PostgreSQL provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-postgres < %{epoch}:%{version}-%{release}
+Provides: gda-postgres = %{epoch}:%{version}-%{release}
%description postgres
This package includes the libgda PostgreSQL provider.
+
+%package postgres-devel
+Summary: PostgreSQL provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-postgres = %{epoch}:%{version}-%{release}
+%description postgres-devel
+This package includes the pkgconfig file for the libgda PostgreSQL provider.
%endif
%if %{SYBASE}
%package sybase
-Summary: libgda Sybase Provider
-Group: System Environment/Libraries
-Obsoletes: gda-sybase < %{epoch}:%{version}-%{release}
-Provides: gda-sybase = %{epoch}:%{version}-%{release}
+Summary: Sybase provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-sybase < %{epoch}:%{version}-%{release}
+Provides: gda-sybase = %{epoch}:%{version}-%{release}
%description sybase
This package includes the libgda Sybase provider.
+
+%package sybase-devel
+Summary: Sybase provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-sybase = %{epoch}:%{version}-%{release}
+%description sybase-devel
+This package includes the pkgconfig file for the libgda Sybase provider.
%endif
%if %{MDB}
%package mdb
-Summary: libgda MDB Provider
-Group: System Environment/Libraries
-Obsoletes: gda-mdb < %{epoch}:%{version}-%{release}
-Provides: gda-mdb = %{epoch}:%{version}-%{release}
+Summary: MDB provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-mdb < %{epoch}:%{version}-%{release}
+Provides: gda-mdb = %{epoch}:%{version}-%{release}
%description mdb
This package includes the libgda MDB provider.
-%endif
+%package mdb-devel
+Summary: MDB provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-mdb = %{epoch}:%{version}-%{release}
+%description mdb-devel
+This package includes the pkgconfig file for the libgda MDB provider.
+%endif
+
%if %{LDAP}
%package ldap
-Summary: libgda LDAP Provider
-Group: System Environment/Libraries
-Obsoletes: gda-ldap < %{epoch}:%{version}-%{release}
-Provides: gda-ldap = %{epoch}:%{version}-%{release}
+Summary: LDAP provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-ldap < %{epoch}:%{version}-%{release}
+Provides: gda-ldap = %{epoch}:%{version}-%{release}
%description ldap
This package includes the libgda LDAP provider.
+
+%package ldap-devel
+Summary: LDAP provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-ldap = %{epoch}:%{version}-%{release}
+%description ldap-devel
+This package includes the pkgconfig file for the libgda LDAP provider.
+%endif
+
+%if %{XBASE}
+%package xbase
+Summary: XBASE provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+%description xbase
+This package includes the GDA XBASE provider.
+
+%package xbase-devel
+Summary: XBASE provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: %{name}-xbase = %{epoch}:%{version}-%{release}, pkgconfig
+%description xbase-devel
+This package includes the pkgconfig file for the libgda XBASE provider.
%endif
%prep
%setup -q
-rm -fr providers/sqlite/sqlite-src
-%patch0 -p1 -b .configure
-%patch1 -p1 -b .sharp
-%patch2 -p1 -b .syslibs
-%patch3 -p1 -b .64bit
+%patch1 -p1 -b .man
+%patch2 -p1 -b .ldap
+%patch3 -p1 -b .sqlite
+%patch4 -p1 -b .64bit
+# fix ppc64 postgres detection
+sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
+ configure configure.in
+# stop autoxxx rerunning because of our patches above
+touch aclocal.m4
+touch `find -name Makefile.in`
%build
-aclocal
-automake
-autoconf
+CONFIG="--disable-static --disable-dependency-tracking"
+
%if %{FREETDS}
CONFIG="$CONFIG --with-tds"
%else
@@ -274,27 +382,32 @@
CONFIG="$CONFIG --without-ldap"
%endif
+%if %{XBASE}
+CONFIG="$CONFIG --with-xbase"
+%else
+CONFIG="$CONFIG --without-xbase"
+%endif
+
%configure $CONFIG
-make
+# Don't use rpath!
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# work around gda-report-test-3.0 linking failing because of the disabling of
+# rpath above
+export LD_LIBRARY_PATH=`pwd`/libsql/.libs
+make %{?_smp_mflags}
%install
-rm -rf %{buildroot}
-%makeinstall
-
-#fixup mono / sharp related files install
-mkdir -p %{buildroot}/%{_datadir}/gapi-2.0
-mv %{buildroot}/%{_libdir}/libgda/gda-api.xml %{buildroot}/%{_datadir}/gapi-2.0
-mkdir -p %{buildroot}/usr/lib/mono/gda-sharp-2.0
-mv %{buildroot}/%{_libdir}/libgda/* %{buildroot}/usr/lib/mono/gda-sharp-2.0
-rmdir %{buildroot}/%{_libdir}/libgda
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
# Cleanup unnecessary, unpackaged files
-rm -f %{buildroot}/%{_libdir}/libgda-1.9/providers/*.{a,la}
-rm -f %{buildroot}/%{_libdir}/*.{a,la}
-rm -f %{buildroot}/%{_sysconfdir}/libgda/sales_test.db
+rm $RPM_BUILD_ROOT/%{_libdir}/libgda-3.0/providers/*.la
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+rm $RPM_BUILD_ROOT/%{_sysconfdir}/libgda-3.0/sales_test.db
-%find_lang libgda-3
+%find_lang libgda-3.0
%post -p /sbin/ldconfig
@@ -307,99 +420,179 @@
%postun devel
if which scrollkeeper-update >/dev/null 2>&1; then scrollkeeper-update; fi
+
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-%files -f libgda-3.lang
-%defattr(-,root,root)
+
+%files -f libgda-3.0.lang
+%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README NEWS
-#%doc %{_datadir}/gnome/help/libgda
-%dir %{_sysconfdir}/libgda
-%config(noreplace) %{_sysconfdir}/libgda/config
+%config(noreplace) %{_sysconfdir}/libgda-3.0
%{_bindir}/*
-%{_datadir}/libgda
+%{_datadir}/libgda-3.0
%{_libdir}/*.so.*
-%dir %{_libdir}/libgda-1.9
-%dir %{_libdir}/libgda-1.9/providers
+%dir %{_libdir}/libgda-3.0
+%dir %{_libdir}/libgda-3.0/providers
# note this file really should be in its own subpackage too, but libgda
# needs to have atleast one provider present to be of any use.
-%{_libdir}/libgda-1.9/providers/libgda-bdb.so
+%{_libdir}/libgda-3.0/providers/libgda-bdb.so
%{_mandir}/man1/*
%{_mandir}/man5/*
%files devel
-%defattr(-,root,root)
-%doc %{_datadir}/gtk-doc/html/libgda
+%defattr(-,root,root,-)
+%doc %{_datadir}/gtk-doc/html/libgda-3.0
%{_includedir}/*
%{_libdir}/*.so
-%{_libdir}/pkgconfig/libgda-2.0.pc
-
-%files sharp
-%defattr(-,root,root)
-%{_datadir}/gapi-2.0
-/usr/lib/mono/gda-sharp-2.0
-%{_libdir}/pkgconfig/gda-sharp-2.0.pc
+%{_libdir}/pkgconfig/libgda-3.0.pc
+%{_libdir}/pkgconfig/libgda-bdb-3.0.pc
%files sqlite
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-sqlite.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-sqlite.so
+
+%files sqlite-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-sqlite-3.0.pc
%if %{FREETDS}
%files freetds
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-freetds.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-freetds.so
+
+%files freetds-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-freetds-3.0.pc
%endif
%if %{IBMDB2}
%files ibmdb2
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-ibmdb2.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-ibmdb2.so
+
+%files ibmdb2-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-imdb2-3.0.pc
%endif
%if %{MYSQL}
%files mysql
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-mysql.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-mysql.so
+
+%files mysql-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-mysql-3.0.pc
%endif
%if %{ODBC}
%files odbc
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-odbc.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-odbc.so
+
+%files odbc-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-odbc-3.0.pc
%endif
%if %{ORACLE}
%files oracle
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-oracle.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-oracle.so
+
+%files oracle-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-oracle-3.0.pc
%endif
%if %{POSTGRES}
%files postgres
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-postgres.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-postgres.so
+
+%files postgres-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-postgres-3.0.pc
%endif
%if %{SYBASE}
%files sybase
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-sybase.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-sybase.so
+
+%files sybase-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-sybase-3.0.pc
%endif
%if %{MDB}
%files mdb
-%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-mdb.so
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-mdb.so
+
+%files mdb-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-mdb-3.0.pc
%endif
%if %{LDAP}
%files ldap
+%defattr(-,root,root,-)
+%{_libdir}/libgda-3.0/providers/libgda-ldap.so
+
+%files ldap-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-ldap-3.0.pc
+%endif
+
+%if %{XBASE}
+%files xbase
%defattr(-,root,root)
-%{_libdir}/libgda-1.9/providers/libgda-ldap.so
+%{_libdir}/libgda-3.0/providers/libgda-xbase.so
+
+%files xbase-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-xbase-3.0.pc
%endif
%changelog
+* Thu Dec 06 2007 Release Engineering <rel-eng at fedoraproject dot org> - 3.0.1-6
+- Rebuild for deps
+
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-5
+- Rebuild to fix untranslated strings on x86_64 in
+ /usr/share/libgda-3.0/sqlite_specs_drop_index.xml
+ which caused multilib problems (bz 342101)
+
+* Fri Aug 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-4
+- Fix building on ppc64 again (patch configure not configure.in, now we are
+ no longer running autoconf)
+
+* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-3
+- Enable microsoft access (mdb) support now that mdbtools is in Fedora
+- Enable xBase (dBase, Clipper, FoxPro) support, it seems that xbase has been
+ available for quite a while now
+- Switch from using mysqlclient10 to using mysql-libs for the msql provider
+
+* Wed Aug 8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-2
+- Build against system sqlite instead of own private copy (this is possible now
+ that the system sqlite is of a high enough version)
+- Enable FreeTDS provider (FreeTDS is in Fedora now)
+- Update License tag for new Licensing Guidelines compliance
+
+* Sun May 27 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:3.0.1-1
+- New upstream release 3.0.1
+- Remove mono bindings sub-package as upstream no longer includes them
+
+* Thu May 10 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-12
+- Don't build mono/sharp bits on ppc64
+- Fixup packaging of sharp bindings to match the mono packaging guidelines
+
+* Fri Dec 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-11
+- Rebuild for new postgres
+
* Mon Aug 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-10
- FE6 Rebuild
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgda/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 27 Nov 2005 20:30:33 -0000 1.3
+++ sources 22 Sep 2008 19:06:19 -0000 1.4
@@ -1 +1 @@
-c943610dc4c9c286bb14d6ce3c6e549b libgda-1.9.100.tar.bz2
+1aaf23c27ba94d0b231f2b123350110a libgda-3.0.1.tar.bz2
--- libgda-1.9.100-64bit.patch DELETED ---
--- libgda-1.9.100-configure.patch DELETED ---
--- libgda-1.9.100-sharp.patch DELETED ---
--- libgda-1.9.100-syslibs.patch DELETED ---
More information about the fedora-extras-commits
mailing list