OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 23-Mar-2005 11:49:58
Branch: HEAD Handle: 2005032310495800
Modified files:
openpkg-src/libgda libgda.patch libgda.spec
Log:
upgrading package: libgda 1.1.99 -> 1.3.1
Summary:
Revision Changes Path
1.4 +15 -15 openpkg-src/libgda/libgda.patch
1.8 +16 -7 openpkg-src/libgda/libgda.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libgda/libgda.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 libgda.patch
--- openpkg-src/libgda/libgda.patch 6 Jan 2005 10:08:25 -0000 1.3
+++ openpkg-src/libgda/libgda.patch 23 Mar 2005 10:49:58 -0000 1.4
@@ -1,6 +1,6 @@
Index: libgda/gda-config.h
--- libgda/gda-config.h.orig 2004-10-09 23:33:53 +0200
-+++ libgda/gda-config.h 2005-01-06 10:24:21 +0100
++++ libgda/gda-config.h 2005-03-23 11:05:56 +0100
@@ -118,8 +118,8 @@
#define GDA_TYPE_DATA_SOURCE_INFO (gda_data_source_info_get_type ())
@@ -13,8 +13,8 @@
GList *gda_config_get_data_source_list (void);
GdaDataSourceInfo *gda_config_find_data_source (const gchar *name);
Index: providers/sqlite/gda-sqlite-provider.c
---- providers/sqlite/gda-sqlite-provider.c.orig 2004-10-09 16:56:27
+0200
-+++ providers/sqlite/gda-sqlite-provider.c 2005-01-06 10:24:43 +0100
+--- providers/sqlite/gda-sqlite-provider.c.orig 2005-03-03 11:52:27
+0100
++++ providers/sqlite/gda-sqlite-provider.c 2005-03-23 11:05:56 +0100
@@ -25,6 +25,7 @@
#endif
@@ -24,33 +24,33 @@
#include <libgda/gda-data-model-array.h>
#include <libgda/gda-util.h>
Index: report/testing/Makefile.in
---- report/testing/Makefile.in.orig 2004-10-10 00:26:53 +0200
-+++ report/testing/Makefile.in 2005-01-06 10:25:37 +0100
-@@ -313,7 +313,7 @@
+--- report/testing/Makefile.in.orig 2005-03-03 18:07:10 +0100
++++ report/testing/Makefile.in 2005-03-23 11:06:25 +0100
+@@ -323,7 +323,7 @@
gda_report_test_SOURCES = \
gda-report-test.c
-gda_report_test_LDADD = \
+gda_report_test_LDADD = -static \
- $(top_builddir)/libgda/libgda-2.la \
- $(top_builddir)/report/libgda-report/libgda-report-2.la \
+ $(top_builddir)/libgda/libgda-3.la \
+ $(top_builddir)/report/libgda-report/libgda-report-3.la \
$(LIBGDA_LIBS)
Index: testing/Makefile.in
---- testing/Makefile.in.orig 2004-10-10 00:26:53 +0200
-+++ testing/Makefile.in 2005-01-06 10:28:21 +0100
-@@ -331,7 +331,7 @@
+--- testing/Makefile.in.orig 2005-03-03 18:07:11 +0100
++++ testing/Makefile.in 2005-03-23 11:06:40 +0100
+@@ -337,7 +337,7 @@
ibmdb2-test.c \
ibmdb2-test.h
-gda_test_LDADD = \
+gda_test_LDADD = -static \
- $(top_builddir)/libgda/libgda-2.la \
+ $(top_builddir)/libgda/libgda-3.la \
$(LIBGDA_LIBS)
Index: tools/Makefile.in
---- tools/Makefile.in.orig 2004-10-10 00:26:54 +0200
-+++ tools/Makefile.in 2005-01-06 10:28:01 +0100
-@@ -404,10 +404,10 @@
+--- tools/Makefile.in.orig 2005-03-03 18:07:11 +0100
++++ tools/Makefile.in 2005-03-23 11:05:56 +0100
+@@ -414,10 +414,10 @@
done
gda-config-tool$(EXEEXT): $(gda_config_tool_OBJECTS)
$(gda_config_tool_DEPENDENCIES)
@rm -f gda-config-tool$(EXEEXT)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libgda/libgda.spec
============================================================================
$ cvs diff -u -r1.7 -r1.8 libgda.spec
--- openpkg-src/libgda/libgda.spec 6 Jan 2005 10:08:25 -0000 1.7
+++ openpkg-src/libgda/libgda.spec 23 Mar 2005 10:49:58 -0000 1.8
@@ -24,8 +24,8 @@
##
# package version
-%define V_major 1.1
-%define V_minor 99
+%define V_major 1.3
+%define V_minor 1
# package information
Name: libgda
@@ -38,7 +38,7 @@
Group: Database
License: GPL/LGPL
Version: %{V_major}.%{V_minor}
-Release: 20050106
+Release: 20050323
# package options
%option with_sqlite yes
@@ -103,24 +103,33 @@
%patch -p0
%build
- CC="%{l_cc}" \
- CFLAGS="%{l_cflags -O}" \
- CPPFLAGS="%{l_cppflags}" \
- LDFLAGS="%{l_ldflags}" \
+ export CC="%{l_cc}"
+ export CFLAGS="%{l_cflags -O}"
+ export CPPFLAGS="%{l_cppflags}"
+ export LDFLAGS="%{l_ldflags}"
./configure \
--prefix=%{l_prefix} \
%if "%{with_sqlite}" == "yes"
--with-sqlite=%{l_prefix} \
+%else
+ --without-sqlite \
%endif
%if "%{with_pgsql}" == "yes"
--with-postgres=%{l_prefix} \
+%else
+ --without-postgres \
%endif
%if "%{with_mysql}" == "yes"
--with-mysql=%{l_prefix} \
+%else
+ --without-mysql \
%endif
%if "%{with_ldap}" == "yes"
--with-ldap=%{l_prefix} \
+%else
+ --without-ldap \
%endif
+ --without-bdb \
--disable-rebuilds \
--enable-shared \
--enable-static
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
