From 72800e6670c5ccacb4d92069a5b7309bfbddee22 Mon Sep 17 00:00:00 2001
From: Denis Leroy <denis@fedoraproject.org>
Date: Sep 30 2009 22:55:42 +0000
Subject: Update to upstream 1.12.0. BRs update, library versioning update. Moved

    examples back into datadir.

---

diff --git a/.cvsignore b/.cvsignore
index 6504e36..ad3fbb3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glom-1.10.1.tar.bz2
+glom-1.12.0.tar.bz2
diff --git a/glom.spec b/glom.spec
index faf5288..8b017b5 100644
--- a/glom.spec
+++ b/glom.spec
@@ -1,9 +1,9 @@
-%define major_version  1.10
-%define minor_version  1
+%define major_version  1.12
+%define minor_version  0
 
 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
@@ -12,7 +12,6 @@ URL:            http://www.glom.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  bakery-devel >= 2.6.0
 BuildRequires:  desktop-file-utils gettext-devel intltool
 BuildRequires:  libgdamm-devel >= 3.99.14
 BuildRequires:  libxml++-devel >= 2.18.1
@@ -26,11 +25,11 @@ BuildRequires:  iso-codes-devel
 BuildRequires:  gnome-doc-utils
 BuildRequires:  scrollkeeper
 BuildRequires:  gtksourceviewmm-devel >= 2.0.0
-BuildRequires:  libgda-devel >= 4.0.1
+BuildRequires:  libgda-devel >= 4.0.4
 BuildRequires:  postgresql-server
 BuildRequires:  libgda-postgres-devel
 BuildRequires:  avahi-ui-devel
-BuildRequires:  goocanvasmm-devel >= 0.13.0
+BuildRequires:  goocanvasmm-devel >= 0.14.0
 BuildRequires:  libepc-devel
 
 # Glom curently only supports postgresql well and uses it by default.
@@ -87,7 +86,8 @@ that use the %{name} libraries.
         --disable-update-mime-database \
         --disable-scrollkeeper \
         --with-postgres-utils=/usr/bin \
-        --disable-sqlite
+        --disable-sqlite \
+	--docdir=%{_datadir}/%{name}/examples
 make %{?_smp_mflags}
 
 
@@ -97,11 +97,8 @@ make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/libglom.so
-
 desktop-file-install --vendor "" --delete-original         \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications          \
-  --add-category X-Fedora                                  \
   ${RPM_BUILD_ROOT}/usr/share/applications/%{name}.desktop
 
 
@@ -140,29 +137,32 @@ scrollkeeper-update -q || :
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %{_bindir}/%{name}
-%{_libdir}/python?.?/site-packages/%{name}.so
+%{_libdir}/python?.?/site-packages/%{name}*.so
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/%{name}.xml
-%{_datadir}/mime-info/*
 %{_datadir}/omf/%{name}
 
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/lib%{name}-1.0.so.*
+%{_libdir}/lib%{name}-%{major_version}.so.*
 
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/glom-1.0
-%{_libdir}/lib%{name}-1.0.so
+%{_includedir}/glom-%{major_version}
+%{_libdir}/lib%{name}-%{major_version}.so
 %{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Sat Sep 26 2009 Denis Leroy <denis@poolshark.org> - 1.12.0-1
+- Update to upstream 1.12.0
+- BRs update, library versioning update
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 2873a7f..c639dd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-611a9cc73aadd1ff5fdc4dd81e240822  glom-1.10.1.tar.bz2
+c2a39caea867eb907302fc646e7e097b  glom-1.12.0.tar.bz2