rpms/libgda/devel libgda-1.9.100-syslibs.patch, NONE, 1.1 libgda.spec, 1.9, 1.10

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Mon Feb 13 16:37:54 UTC 2006


Author: jwrdegoede

Update of /cvs/extras/rpms/libgda/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12122

Modified Files:
	libgda.spec 
Added Files:
	libgda-1.9.100-syslibs.patch 
Log Message:
libgda use system sqlite WIP

libgda-1.9.100-syslibs.patch:

--- NEW FILE libgda-1.9.100-syslibs.patch ---
--- libgda-1.9.100/providers/sqlite/Makefile.am~	2006-02-13 17:31:19.000000000 +0100
+++ libgda-1.9.100/providers/sqlite/Makefile.am	2006-02-13 17:32:21.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = sqlite-src
+SUBDIRS = 
 
 providerdir=$(libdir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/providers
 provider_LTLIBRARIES = libgda-sqlite.la
@@ -27,7 +27,6 @@
 libgda_sqlite_la_LDFLAGS = -export-dynamic -module -avoid-version
 libgda_sqlite_la_LIBADD = \
 	$(LIBGDA_LIBS) \
-	$(top_builddir)/libgda/libgda-3.la \
-	$(top_builddir)/providers/sqlite/sqlite-src/libsqlite.la 
+	$(top_builddir)/libgda/libgda-3.la -lsqlite3
 
 EXTRA_DIST = $(config_DATA)


Index: libgda.spec
===================================================================
RCS file: /cvs/extras/rpms/libgda/devel/libgda.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libgda.spec	17 Jan 2006 08:19:39 -0000	1.9
+++ libgda.spec	13 Feb 2006 16:37:53 -0000	1.10
@@ -47,6 +47,7 @@
 BuildRequires:    libxslt-devel >= 1.0.9
 BuildRequires:    libxml2-devel ncurses-devel scrollkeeper groff readline-devel
 BuildRequires:    db4-devel gtk-doc mono-devel gtk-sharp2 gtk-sharp2-gapi
+BuildRequires:    sqlite-devel
 
 %if %{FREETDS}
 BuildRequires:    freetds-devel
@@ -74,6 +75,7 @@
 
 Patch0: libgda-1.9.100-configure.patch
 Patch1: libgda-1.9.100-sharp.patch
+Patch2: libgda-1.9.100-syslibs.patch
 
 %description
 libgda is a library that eases the task of writing
@@ -195,8 +197,10 @@
 
 %prep
 %setup -q
+rm -fr providers/sqlite/sqlite-src
 %patch0 -p1 -b .configure
 %patch1 -p1 -b .sharp
+%patch2 -p1 -b .syslibs
 
 %build
 aclocal




More information about the fedora-extras-commits mailing list