[libgda] upstream 4.2.0
Haïkel Guémar
hguemar at fedoraproject.org
Tue Oct 26 21:31:12 UTC 2010
commit 2ea22efe821dc051816f78b7b8d00ddb285a862d
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date: Tue Oct 26 23:33:30 2010 +0200
upstream 4.2.0
.gitignore | 1 +
libgda-4.2.0-fix.patch | 39 +++++++++++++++++++++++++++++++++
libgda.spec | 56 ++++++++++++++++++++++++++++++++++++++---------
sources | 2 +-
4 files changed, 86 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8901720..2b2d5d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
libgda-4.1.6.tar.bz2
+/libgda-4.2.0.tar.bz2
diff --git a/libgda-4.2.0-fix.patch b/libgda-4.2.0-fix.patch
new file mode 100644
index 0000000..0b4ee06
--- /dev/null
+++ b/libgda-4.2.0-fix.patch
@@ -0,0 +1,39 @@
+diff --git a/libgda/sqlite/Makefile.am b/libgda/sqlite/Makefile.am
+index 1d2df2c..ecce04b 100644
+--- a/libgda/sqlite/Makefile.am
++++ b/libgda/sqlite/Makefile.am
+@@ -58,9 +58,9 @@ sqlitesources = \
+ gda-sqlite.h \
+ keywords_hash.h \
+ gda-symbols-util.h \
+- gda-symbols-util.c
+-
+-$(libgda_sqlite_la_OBJECTS): xml_embedded.h keywords_hash.c
++ gda-symbols-util.c \
++ xml_embedded.h \
++ keywords_hash.c
+
+ libgda_sqlite_la_SOURCES = $(sqlitesources)
+ libgda_sqlite_la_CFLAGS = -DPNAME=\""SQLite"\" -DCLASS_PREFIX=\""GdaSqlite"\" -DSEARCH_LIB_PATH=\""$(SQLITE_PATH)"\"
+@@ -85,4 +85,5 @@ gdainclude_HEADERS=$(sqliteheaders)
+
+ EXTRA_DIST = gen_emb_string.c mkkeywordhash.c keywords.list
+
+-CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) xml_embedded.h mkkeywordhash$(EXEEXT_FOR_BUILD) keywords_hash.c
++CLEANFILES = gen_emb_string$(EXEEXT_FOR_BUILD) mkkeywordhash$(EXEEXT_FOR_BUILD) $(BUILT_SOURCES)
++BUILT_SOURCES = xml_embedded.h keywords_hash.c
+diff --git a/libgda/sqlite/mkkeywordhash.c b/libgda/sqlite/mkkeywordhash.c
+index dc6ce89..28f4f83 100644
+--- a/libgda/sqlite/mkkeywordhash.c
++++ b/libgda/sqlite/mkkeywordhash.c
+@@ -370,6 +370,10 @@ main (int argc, char **argv)
+ }
+
+ /* Begin generating code */
++ printf("#include <stdio.h>\n");
++ printf("#include <string.h>\n");
++ printf("#include <glib.h>\n");
++
+ printf("/* Hash score: %d */\n", bestCount);
+ printf("static int %skeywordCode(const char *z, int n){\n", prefix ? prefix : "");
+ printf(" /* zText[] encodes %d bytes of keywords in %d bytes */\n",
diff --git a/libgda.spec b/libgda.spec
index e7fabdb..1a36fb9 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -40,7 +40,7 @@
Name: libgda
Epoch: 1
-Version: 4.1.6
+Version: 4.2.0
Release: 1%{?dist}
Summary: Library for writing gnome database programs
Group: System Environment/Libraries
@@ -48,7 +48,8 @@ License: LGPLv2+
URL: http://www.gnome-db.org/
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/4.0/%{name}-%{version}.tar.bz2
Patch1: libgda-3.0.0-man.patch
-Patch3: libgda-3.99.8-lib64.patch
+Patch2: libgda-3.99.8-lib64.patch
+Patch3: libgda-4.2.0-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig >= 0.8
BuildRequires: glib2-devel >= 2.16
@@ -175,6 +176,23 @@ Requires: %{name}-sqlite = %{epoch}:%{version}-%{release}
%description sqlite-devel
This package includes the pkgconfig file for the libgda SQLite provider.
+%package sqlcipher
+Summary: SQLite provider for libgda
+Group: System Environment/Libraries
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Obsoletes: gda-sqlite < %{epoch}:%{version}-%{release}
+Provides: gda-sqlite = %{epoch}:%{version}-%{release}
+%description sqlcipher
+This package includes the libgda SQLCipher provider.
+
+%package sqlcipher-devel
+Summary: SQLite provider for libgda pkgconfig file
+Group: Development/Libraries
+Requires: pkgconfig
+Requires: %{name}-sqlite = %{epoch}:%{version}-%{release}
+%description sqlcipher-devel
+This package includes the pkgconfig file for the libgda SQLCipher provider.
+
%package web
Summary: web provider for libgda
Group: System Environment/Libraries
@@ -398,17 +416,15 @@ This package includes the pkgconfig file for the libgda Java JDBC provider.
%prep
%setup -q
%patch1 -p1 -b .man
-%patch3 -p1 -b .lib64
-# fix ppc64 postgres detection
-sed -i 's/x86_64\* | sparc64\*) lib="lib64";;/x86_64\* | sparc64\* | powerpc64\*) lib="lib64";;/' \
- configure configure.in
+%patch2 -p1 -b .lib64
+%patch3 -p1 -b .fix
# need to reconfigure autotools scripts against newer toolchain
autoreconf -fi
%build
CONFIG="--disable-static --disable-dependency-tracking --enable-system-sqlite --with-libsoup \
- --enable-gtk-doc --enable-introspection=yes"
+ --enable-gtk-doc --enable-introspection=no"
%if %{FREETDS}
CONFIG="$CONFIG --with-tds"
@@ -520,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/gda-sql-4.0
%{_bindir}/gda-test-connection-4.0
%{_bindir}/gda_trml2*
+%{_bindir}/gda-list-config
+%{_bindir}/gda-list-server-op
+%{_bindir}/gda-sql
%{_datadir}/libgda-4.0/dtd/libgda-*.dtd
%{_datadir}/%{name}-4.0/language-specs
%{_datadir}/%{name}-4.0/import_encodings.xml
@@ -533,7 +552,7 @@ rm -rf $RPM_BUILD_ROOT
# needs to have atleast one provider present to be of any use.
%{_libdir}/libgda-4.0/providers/libgda-bdb.so
%{_datadir}/%{name}-4.0/bdb_specs*.xml
-%{_libdir}/girepository-1.0/Gda-4.0.typelib
+#%{_libdir}/girepository-1.0/Gda-4.0.typelib
%{_mandir}/man1/*
%files devel
@@ -549,7 +568,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libgda-bdb-4.0.pc
%{_libdir}/pkgconfig/libgda-report-4.0.pc
%{_libdir}/pkgconfig/libgda-xslt-4.0.pc
-%{_datadir}/gir-1.0/Gda-4.0.gir
+#%{_datadir}/gir-1.0/Gda-4.0.gir
%files ui
%defattr(-,root,root,-)
@@ -560,7 +579,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/libgda-4.0/dtd/gdaui-layout.dtd
%{_datadir}/%{name}-4.0/server_operation.glade
%{_datadir}/%{name}-4.0/ui/gdaui-*.xml
-%{_libdir}/girepository-1.0/Gdaui-4.0.typelib
+#%{_libdir}/girepository-1.0/Gdaui-4.0.typelib
%{_datadir}/%{name}-4.0/pixmaps/gdaui-generic.png
%files ui-devel
@@ -572,7 +591,7 @@ rm -rf $RPM_BUILD_ROOT
# most of samples here requires libgda-ui
%{_datadir}/%{name}-4.0/demo/*
%{_datadir}/%{name}-4.0/pixmaps/bin-attachment-16x16.png
-%{_datadir}/gir-1.0/Gdaui-4.0.gir
+#%{_datadir}/gir-1.0/Gdaui-4.0.gir
%files tools
%defattr(-,root,root,-)
@@ -597,6 +616,15 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{_libdir}/pkgconfig/libgda-sqlite-4.0.pc
+%files sqlcipher
+%defattr(-,root,root,-)
+%{_libdir}/%{name}-4.0/providers/%{name}-sqlcipher.so
+%{_datadir}/%{name}-4.0/sqlcipher_specs*.xml
+
+%files sqlcipher-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-sqlcipher-4.0.pc
+
%files web
%defattr(-,root,root,-)
%{_libdir}/%{name}-4.0/providers/%{name}-web.so
@@ -725,6 +753,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 26 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 1:4.2.0-1
+- Update to upstream 4.2.0
+- New provider: sqlcipher (SQLite encryption extension)
+- New patch fixing 4.2.0 build issue
+- Disable GObject introspection since it's broken
+
* Wed Jun 16 2010 Haïkel Guémar <hguemar at fedoraproject.org> - 1:4.1.6-1
- Update to upstream 4.1.6
- Add new BR: gnome-doc-utils
diff --git a/sources b/sources
index 3102293..0599d60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-353dbf284ca7b43935a8fb8863b8391b libgda-4.1.6.tar.bz2
+4b00c2b61430b2a0ea00e0332d1e8ef4 libgda-4.2.0.tar.bz2
More information about the scm-commits
mailing list