From 09ddb563a69fa90a658bc3df121488882179cc77 Mon Sep 17 00:00:00 2001
From: Haïkel Guémar <hguemar@fedoraproject.org>
Date: Jun 16 2010 19:09:14 +0000
Subject: update to 4.1.6


---

diff --git a/.cvsignore b/.cvsignore
index ffc6000..8901720 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libgda-4.1.4.tar.bz2
+libgda-4.1.6.tar.bz2
diff --git a/libgda.spec b/libgda.spec
index b6b6305..b60c6d3 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -12,7 +12,7 @@
 # --without tds
 # --without xbase
 # --without java
-# 
+#
 
 %define           IBMDB2   0
 %define           ORACLE   0
@@ -40,7 +40,7 @@
 
 Name:             libgda
 Epoch:            1
-Version:          4.1.4
+Version:          4.1.6
 Release:          1%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
@@ -69,6 +69,7 @@ BuildRequires:    gtk-doc scrollkeeper intltool gettext flex bison perl(XML::Par
 BuildRequires:    gnome-vfs2-devel >= 2.20
 BuildRequires:    libsoup-devel
 BuildRequires:	  java-1.6.0-openjdk >= 1.6.0.0
+BuildRequires:    gnome-doc-utils
 # note we do not provide these, they no longer exist
 Obsoletes:        %{name}-sharp < %{epoch}:%{version}-%{release}
 Obsoletes:        %{name}-sharp-devel < %{epoch}:%{version}-%{release}
@@ -342,7 +343,7 @@ Requires:         %{name}-mdb = %{epoch}:%{version}-%{release}
 %description mdb-devel
 This package includes the pkgconfig file for the libgda MDB provider.
 %endif
-		
+
 %if %{LDAP}
 %package ldap
 Summary:          LDAP provider for libgda
@@ -488,15 +489,11 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT%{_datadir}/gir-1.0/
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}-4.0/gir-1.0/Gda-4.0.gir \
-   $RPM_BUILD_ROOT%{_datadir}/gir-1.0/Gda-4.0.gir
 # libgda/libgda.h is not installed ?
 mv %{name}/%{name}.h $RPM_BUILD_ROOT/%{_includedir}/%{name}-4.0/%{name}/%{name}.h
 # Cleanup unnecessary, unpackaged files
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 rm $RPM_BUILD_ROOT/%{_sysconfdir}/libgda-4.0/sales_test.db
-rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}-4.0/gir-1.0
 
 %find_lang libgda-4.0
 
@@ -564,6 +561,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
 %{_datadir}/%{name}-4.0/pixmaps/gdaui-generic.png
 
 %files ui-devel
@@ -575,6 +573,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
 
 %files tools
 %defattr(-,root,root,-)
@@ -587,6 +586,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}-4.0/pixmaps/gda-browser*.png
 %{_datadir}/%{name}-4.0/pixmaps/gda-control-center*.png
 %{_datadir}/icons/hicolor/*/apps/gda-control-center.png
+%{_datadir}/gnome/help/gda-browser/*
 %{_datadir}/pixmaps/gda-browser-4.0.png
 
 %files sqlite
@@ -726,13 +726,17 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jun 16 2010 Haïkel Guémar <hguemar@fedoraproject.org> - 1:4.1.6-1
+- Update to upstream 4.1.6
+- Add new BR: gnome-doc-utils
+
 * Tue Apr 27 2010 Haïkel Guémar <hguemar@fedoraproject.org> - 1:4.1.4-1
 - Update to upstream 4.1.4 (required by Glom)
 - Added web provider and ui subpackages
 - Added new BR (gtk2, unique, goocanvas, graphviz) for libgda-ui
 
 * Thu Apr 22 2010 Haïkel Guémar <hguemar@fedoraproject.org> - 1:4.0.8-2
-- add gir descriptions files 
+- add gir descriptions files
 
 * Sat Mar 20 2010 Denis Leroy <denis@poolshark.org> - 1:4.0.8-1
 - Update to upstream 4.0.8
@@ -742,7 +746,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jan 18 2010 Denis Leroy <denis@poolshark.org> - 1:4.0.6-1
 - Update to upstream 4.0.6
-- Added Java JDBC provider subpackage 
+- Added Java JDBC provider subpackage
 
 * Sat Nov  7 2009 Denis Leroy <denis@poolshark.org> - 1:4.0.5-1
 - Update to upstream 4.0.5
@@ -819,7 +823,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Wed Aug  8 2007 Hans de Goede <j.w.r.degoede@hhs.nl> 1:3.0.1-2
 - Build against system sqlite instead of own private copy (this is possible now
-  that the system sqlite is of a high enough version) 
+  that the system sqlite is of a high enough version)
 - Enable FreeTDS provider (FreeTDS is in Fedora now)
 - Update License tag for new Licensing Guidelines compliance
 
diff --git a/sources b/sources
index cb5a5f6..3102293 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d092638c28711fb9577f8cc6ac65fd53  libgda-4.1.4.tar.bz2
+353dbf284ca7b43935a8fb8863b8391b  libgda-4.1.6.tar.bz2