[glom/f16] upstream 1.8.4

[Haïkel Guémar]

commit c6322928a97632032d8bfe84be8c8461e05b8eea
Author: Haïkel Guémar <hguemar at fedoraproject.org>
Date:   Wed Oct 12 02:34:16 2011 +0200

    upstream 1.8.4

 .gitignore |    1 +
 glom.spec  |   15 +++++++++------
 sources    |    2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c2ea8f8..41ba469 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ glom-1.15.1.tar.bz2
 /glom-1.16.1.tar.bz2
 /glom-1.18.1.tar.bz2
 /glom-1.18.3.tar.bz2
+/glom-1.18.4.tar.bz2
diff --git a/glom.spec b/glom.spec
index 895eeb7..f1a3d23 100644
--- a/glom.spec
+++ b/glom.spec
@@ -1,9 +1,9 @@
 %global major_version  1.18
-%global minor_version  3
+%global minor_version  4
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Easy-to-use database designer and user interface
 
 Group:          Applications/Databases
@@ -13,11 +13,11 @@ Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{n
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils gettext-devel intltool
-BuildRequires:  libgdamm-devel >= 3.99.20
+BuildRequires:  libgdamm-devel >= 4.1.3
 BuildRequires:  libxml++-devel >= 2.18.1
 BuildRequires:  python-devel
 BuildRequires:  gnome-python2-gda-devel >= 2.25.3
-BuildRequires:  gtkmm24-devel >= 2.14.9
+BuildRequires:  gtkmm24-devel >= 2.23.90
 BuildRequires:  gconfmm26-devel
 BuildRequires:  libxslt-devel >= 1.1.10
 BuildRequires:  pygtk2-devel >= 2.6
@@ -29,7 +29,7 @@ BuildRequires:  libgda-devel >= 4.1.4
 BuildRequires:  postgresql-server
 BuildRequires:  libgda-postgres-devel
 BuildRequires:  avahi-ui-devel
-BuildRequires:  goocanvasmm-devel >= 0.14.0
+BuildRequires:  goocanvasmm-devel >= 0.15.4
 BuildRequires:  libepc-devel
 BuildRequires:  boost-devel
 BuildRequires:  python-sphinx
@@ -90,7 +90,7 @@ that use the %{name} libraries.
         --disable-scrollkeeper \
         --with-postgres-utils=/usr/bin \
         --disable-sqlite \
-        --docdir=%{_datadir}/%{name}/examples
+        --docdir=%{_datadir}/%{name}
 # removing rpath
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -169,6 +169,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Tue Oct 11 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 1.18.4-1
+- upstream 1.18.4
+
 * Sun Aug 28 2011 Haïkel Guémar <hguemar at fedoraproject.org> - 1.18.3-2
 - recompile against newer libepc
 
diff --git a/sources b/sources
index f375782..17f2db8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8431f12fafef1dae794172c0728534b  glom-1.18.3.tar.bz2
+ebfdcee572b206bf61e96bb2f6153100  glom-1.18.4.tar.bz2