rpms/libgda/devel libgda-3.0.1-detect-sqlite.patch, NONE, 1.1 libgda.spec, 1.24, 1.25
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Wed Aug 8 11:03:46 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7721
Modified Files:
libgda.spec
Added Files:
libgda-3.0.1-detect-sqlite.patch
Log Message:
* 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
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
Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libgda.spec 27 May 2007 21:10:24 -0000 1.24
+++ libgda.spec 8 Aug 2007 11:03:13 -0000 1.25
@@ -1,7 +1,6 @@
-# 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
@@ -10,9 +9,10 @@
# --without mysql
# --without odbc
# --without postgres
+# --without tds
#
-%define FREETDS 0
+%define FREETDS 1
%define IBMDB2 0
%define MYSQL 1
%define ODBC 1
@@ -22,7 +22,6 @@
%define MDB 0
%define LDAP 1
-%{?_with_tds:%define FREETDS 1}
%{?_with_db2:%define IBMDB2 1}
%{?_with_mdb:%define MDB 1}
%{?_with_oracle:%define ORACLE 1}
@@ -31,24 +30,27 @@
%{?_without_mysql:%define MYSQL 0}
%{?_without_odbc:%define ODBC 0}
%{?_without_postgres:%define POSTGRES 0}
+%{?_without_tds:%define FREETDS 0}
Name: libgda
Epoch: 1
Version: 3.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library for writing gnome database programs
Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+
URL: http://www.gnome-db.org/
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
Patch0: libgda-1.9.100-configure.patch
Patch1: libgda-3.0.0-man.patch
Patch2: libgda-3.0.1-ldap.patch
+Patch3: libgda-3.0.1-detect-sqlite.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: sqlite-devel >= 3.4.0
+BuildRequires: libxml2-devel ncurses-devel readline-devel
BuildRequires: db4-devel gamin-devel gtk-doc scrollkeeper groff gettext
BuildRequires: flex bison intltool automake libtool
# note we do not provide these, they no longer exist
@@ -292,6 +294,7 @@
%patch0 -p1 -b .configure
%patch1 -p1 -b .man
%patch2 -p1 -b .ldap
+%patch3 -p1 -b .sqlite
# fix ppc64 postgres detection
sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
configure.in
@@ -511,6 +514,12 @@
%changelog
+* 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
More information about the fedora-extras-commits
mailing list