From 91e57f46cdf71a5222813f277684a12aa239db15 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jan 25 2008 16:30:10 +0000 Subject: - New upstream release 3.1.2 (needed for new gnumeric) - Drop upstreamed / no longer needed patches --- diff --git a/.cvsignore b/.cvsignore index 8e5f552..050d00b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libgda-3.0.1.tar.bz2 +libgda-3.1.2.tar.bz2 diff --git a/libgda-3.0.1-detect-sqlite.patch b/libgda-3.0.1-detect-sqlite.patch deleted file mode 100644 index 54b8924..0000000 --- a/libgda-3.0.1-detect-sqlite.patch +++ /dev/null @@ -1,31 +0,0 @@ -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; } diff --git a/libgda-3.0.1-ldap.patch b/libgda-3.0.1-ldap.patch deleted file mode 100644 index c5a2c3c..0000000 --- a/libgda-3.0.1-ldap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - #include - #include "gda-ldap-provider.h" -+/* we use the old API (time to update) */ -+#define LDAP_DEPRECATED 1 - #include - #include - diff --git a/libgda-3.0.1-mdb-64bit.patch b/libgda-3.0.1-mdb-64bit.patch deleted file mode 100644 index 293fe16..0000000 --- a/libgda-3.0.1-mdb-64bit.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 -+#include - - 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; diff --git a/libgda.spec b/libgda.spec index d9b4b1b..2b22eec 100644 --- a/libgda.spec +++ b/libgda.spec @@ -37,17 +37,14 @@ Name: libgda Epoch: 1 -Version: 3.0.1 -Release: 6%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Summary: Library for writing gnome database programs Group: System Environment/Libraries License: LGPLv2+ URL: http://www.gnome-db.org/ -Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 +Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/3.1/%{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 @@ -314,9 +311,6 @@ This package includes the pkgconfig file for the libgda XBASE provider. %prep %setup -q %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 @@ -447,6 +441,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %{_libdir}/pkgconfig/libgda-3.0.pc %{_libdir}/pkgconfig/libgda-bdb-3.0.pc +%{_libdir}/pkgconfig/libgda-report-3.0.pc +%{_libdir}/pkgconfig/libgda-xslt-3.0.pc %files sqlite %defattr(-,root,root,-) @@ -558,6 +554,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 25 2008 Hans de Goede 1:3.1.2-1 +- New upstream release 3.1.2 (needed for new gnumeric) +- Drop upstreamed / no longer needed patches + * Thu Dec 06 2007 Release Engineering - 3.0.1-6 - Rebuild for deps diff --git a/sources b/sources index 7d23d12..cc10f3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1aaf23c27ba94d0b231f2b123350110a libgda-3.0.1.tar.bz2 +fe299d264ddeb7fbc36276f74f1abfdc libgda-3.1.2.tar.bz2