OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 06-Jan-2005 11:08:25
Branch: HEAD Handle: 2005010610082500
Modified files:
openpkg-src/libgda libgda.patch libgda.spec
Log:
upgrading package: libgda 1.0.4 -> 1.1.99
Summary:
Revision Changes Path
1.3 +54 -158 openpkg-src/libgda/libgda.patch
1.7 +15 -9 openpkg-src/libgda/libgda.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libgda/libgda.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 libgda.patch
--- openpkg-src/libgda/libgda.patch 8 Jun 2004 18:39:02 -0000 1.2
+++ openpkg-src/libgda/libgda.patch 6 Jan 2005 10:08:25 -0000 1.3
@@ -1,162 +1,7 @@
-Index: libgda/gda-util.c
---- libgda/gda-util.c.orig 2004-01-15 12:56:40 +0100
-+++ libgda/gda-util.c 2004-06-08 15:36:27 +0200
-@@ -60,7 +60,7 @@
- case GDA_VALUE_TYPE_TIME : return "time";
- case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp";
- case GDA_VALUE_TYPE_TINYINT : return "tinyint";
-- default:
-+ default: break;
- }
-
- return "string";
-Index: providers/sqlite/gda-sqlite-provider.c
---- providers/sqlite/gda-sqlite-provider.c.orig 2004-04-15 12:21:37
+0200
-+++ providers/sqlite/gda-sqlite-provider.c 2004-06-08 15:39:23 +0200
-@@ -25,6 +25,8 @@
- #endif
-
- #include <stdlib.h>
-+#include <string.h>
-+#include <libgda/gda-util.h>
- #include <libgda/gda-intl.h>
- #include <libgda/gda-data-model-array.h>
- #include "gda-sqlite.h"
-@@ -623,7 +625,7 @@
- case GDA_CONNECTION_FEATURE_TRIGGERS :
- case GDA_CONNECTION_FEATURE_VIEWS :
- return TRUE;
-- default:
-+ default: break;
- }
-
- return FALSE;
-@@ -809,7 +811,7 @@
- return get_tables (cnc);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_types ();
-- default:
-+ default: break;
- }
-
- return NULL;
-Index: providers/xml/gda-xml-provider.c
---- providers/xml/gda-xml-provider.c.orig 2003-09-02 01:55:02 +0200
-+++ providers/xml/gda-xml-provider.c 2004-06-08 15:39:54 +0200
-@@ -681,7 +681,7 @@
- return get_tables (cnc, xmldb);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_types (cnc);
-- default :
-+ default : break;
- }
-
- return NULL;
-Index: tools/Makefile.in
---- tools/Makefile.in.orig 2004-04-18 21:09:45 +0200
-+++ tools/Makefile.in 2004-06-08 15:54:19 +0200
-@@ -320,11 +320,11 @@
- am_gda_config_tool_OBJECTS = gda-config-tool.$(OBJEXT)
- gda_config_tool_OBJECTS = $(am_gda_config_tool_OBJECTS)
- gda_config_tool_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la
--gda_config_tool_LDFLAGS =
-+gda_config_tool_LDFLAGS = -static
- am_gda_run_OBJECTS = gda-run.$(OBJEXT)
- gda_run_OBJECTS = $(am_gda_run_OBJECTS)
- gda_run_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la
--gda_run_LDFLAGS =
-+gda_run_LDFLAGS = -static
-
- DEFAULT_INCLUDES = -I. -I$(srcdir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-Index: testing/Makefile.in
---- testing/Makefile.in.orig 2004-04-18 21:09:45 +0200
-+++ testing/Makefile.in 2004-06-08 15:58:49 +0200
-@@ -314,7 +314,7 @@
- ibmdb2-test.$(OBJEXT)
- gda_test_OBJECTS = $(am_gda_test_OBJECTS)
- gda_test_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la
--gda_test_LDFLAGS =
-+gda_test_LDFLAGS = -static
-
- DEFAULT_INCLUDES = -I. -I$(srcdir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-Index: report/testing/Makefile.in
---- report/testing/Makefile.in.orig 2004-04-18 21:09:45 +0200
-+++ report/testing/Makefile.in 2004-06-08 15:58:15 +0200
-@@ -299,7 +299,7 @@
- gda_report_test_OBJECTS = $(am_gda_report_test_OBJECTS)
- gda_report_test_DEPENDENCIES = $(top_builddir)/libgda/libgda-2.la \
- $(top_builddir)/report/libgda-report/libgda-report-2.la
--gda_report_test_LDFLAGS =
-+gda_report_test_LDFLAGS = -static
-
- DEFAULT_INCLUDES = -I. -I$(srcdir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-Index: providers/mysql/gda-mysql-provider.c
---- providers/mysql/gda-mysql-provider.c.orig 2003-11-26 22:01:22
+0100
-+++ providers/mysql/gda-mysql-provider.c 2004-06-08 17:18:22 +0200
-@@ -510,7 +510,7 @@
-
- g_free (str);
- break;
-- default:
-+ default: break;
- }
-
- return reclist;
-@@ -655,7 +655,7 @@
- case GDA_CONNECTION_FEATURE_SQL :
- case GDA_CONNECTION_FEATURE_TRANSACTIONS :
- return TRUE;
-- default :
-+ default : break;
- }
-
- return FALSE;
-@@ -1187,7 +1187,7 @@
- return get_mysql_tables (cnc, params);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_mysql_types (cnc, params);
-- default :
-+ default : break;
- }
-
- return NULL;
-Index: providers/ldap/gda-ldap-provider.c
---- providers/ldap/gda-ldap-provider.c.orig 2003-02-03 18:12:13 +0100
-+++ providers/ldap/gda-ldap-provider.c 2004-06-08 17:19:02 +0200
-@@ -275,7 +275,7 @@
- switch (feature) {
- case GDA_CONNECTION_FEATURE_SQL :
- return TRUE;
-- default :
-+ default : break;
- }
-
- return FALSE;
-@@ -466,7 +466,7 @@
- return get_ldap_tables (cnc, params);
- case GDA_CONNECTION_SCHEMA_TYPES :
- return get_ldap_types (cnc, params);
-- default :
-+ default : break;
- }
-
- return NULL;
Index: libgda/gda-config.h
---- libgda/gda-config.h.orig 2003-11-03 10:48:05 +0100
-+++ libgda/gda-config.h 2004-06-08 20:35:29 +0200
-@@ -74,7 +74,7 @@
-
- GType gda_provider_info_get_type (void);
- GdaProviderInfo* gda_provider_info_copy (GdaProviderInfo *src);
--void gda_config_free_provider_info (GdaProviderInfo
*provider_info); //TODO: Rename to gda_provider_info_free
-+void gda_config_free_provider_info (GdaProviderInfo
*provider_info);
-
- GList *gda_config_get_provider_list (void);
- void gda_config_free_provider_list (GList *list);
-@@ -97,8 +97,8 @@
+--- libgda/gda-config.h.orig 2004-10-09 23:33:53 +0200
++++ libgda/gda-config.h 2005-01-06 10:24:21 +0100
+@@ -118,8 +118,8 @@
#define GDA_TYPE_DATA_SOURCE_INFO (gda_data_source_info_get_type ())
GType gda_data_source_info_get_type (void);
@@ -167,3 +12,54 @@
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
+@@ -25,6 +25,7 @@
+ #endif
+
+ #include <stdlib.h>
++#include <string.h>
+ #include <libgda/gda-intl.h>
+ #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 @@
+ 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 \
+ $(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 @@
+ ibmdb2-test.c \
+ ibmdb2-test.h
+
+-gda_test_LDADD = \
++gda_test_LDADD = -static \
+ $(top_builddir)/libgda/libgda-2.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 @@
+ done
+ gda-config-tool$(EXEEXT): $(gda_config_tool_OBJECTS)
$(gda_config_tool_DEPENDENCIES)
+ @rm -f gda-config-tool$(EXEEXT)
+- $(LINK) $(gda_config_tool_LDFLAGS) $(gda_config_tool_OBJECTS)
$(gda_config_tool_LDADD) $(LIBS)
++ $(LINK) -static $(gda_config_tool_LDFLAGS) $(gda_config_tool_OBJECTS)
$(gda_config_tool_LDADD) $(LIBS)
+ gda-run$(EXEEXT): $(gda_run_OBJECTS) $(gda_run_DEPENDENCIES)
+ @rm -f gda-run$(EXEEXT)
+- $(LINK) $(gda_run_LDFLAGS) $(gda_run_OBJECTS) $(gda_run_LDADD) $(LIBS)
++ $(LINK) -static $(gda_run_LDFLAGS) $(gda_run_OBJECTS) $(gda_run_LDADD)
$(LIBS)
+
+ mostlyclean-compile:
+ -rm -f *.$(OBJEXT)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libgda/libgda.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 libgda.spec
--- openpkg-src/libgda/libgda.spec 1 Jan 2005 10:51:26 -0000 1.6
+++ openpkg-src/libgda/libgda.spec 6 Jan 2005 10:08:25 -0000 1.7
@@ -23,6 +23,10 @@
## SUCH DAMAGE.
##
+# package version
+%define V_major 1.1
+%define V_minor 99
+
# package information
Name: libgda
Summary: GNU Data Access Library
@@ -33,8 +37,8 @@
Class: EVAL
Group: Database
License: GPL/LGPL
-Version: 1.0.4
-Release: 20040706
+Version: %{V_major}.%{V_minor}
+Release: 20050106
# package options
%option with_sqlite yes
@@ -43,13 +47,13 @@
%option with_ldap no
# list of sources
-Source0:
ftp://ftp.gnome-db.org/pub/gnome-db/sources/v%{version}/libgda-%{version}.tar.gz
+Source0:
ftp://ftp.gnome.org/pub/GNOME/sources/libgda/%{V_major}/libgda-%{version}.tar.gz
Patch0: libgda.patch
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20040130
+BuildPreReq: OpenPKG, openpkg >= 20040130, make
PreReq: OpenPKG, openpkg >= 20040130
BuildPreReq: libxml, libxslt
PreReq: libxml, libxslt
@@ -88,9 +92,9 @@
%track
prog libgda = {
version = %{version}
- url = ftp://ftp.gnome-db.org/pub/gnome-db/sources/
- regex = (v\d+.[02468]\.\d+)
- url = ftp://ftp.gnome-db.org/pub/gnome-db/sources/__NEWVER__/
+ url = ftp://ftp.gnome.org/pub/GNOME/sources/libgda/
+ regex = (\d+.\d+)
+ url = ftp://ftp.gnome.org/pub/GNOME/sources/libgda/__NEWVER__/
regex = libgda-(__VER__)\.tar\.gz
}
@@ -120,11 +124,13 @@
--disable-rebuilds \
--enable-shared \
--enable-static
- %{l_make} %{l_mflags -O}
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
- %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
+ %{l_make} %{l_mflags} install \
+ AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT" \
+ mkinstalldirs="%{l_shtool} mkdir -f -p -m 755"
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/locale
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gtk-doc
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
