From 2ca944180fb99e60ea5ddd07894b636cba7008e4 Mon Sep 17 00:00:00 2001
From: Denis Leroy <denis@fedoraproject.org>
Date: Jun 18 2008 07:40:40 +0000
Subject: Update to 1.6.17, gcc 4.3 patch upstreamed


---

diff --git a/.cvsignore b/.cvsignore
index 0735707..4c042b3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glom-1.6.15.tar.bz2
+glom-1.6.17.tar.bz2
diff --git a/glom-1.6.8-gcc43.patch b/glom-1.6.8-gcc43.patch
deleted file mode 100644
index eebea59..0000000
--- a/glom-1.6.8-gcc43.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- glom-1.6.8/glom/translation/window_translations.cc.orig	2008-02-15 12:36:22.000000000 +0100
-+++ glom-1.6.8/glom/translation/window_translations.cc	2008-02-15 12:36:47.000000000 +0100
-@@ -33,6 +33,7 @@
- 
- #include <libgnomevfsmm/handle.h>
- #include <sstream>
-+#include <cstring>
- 
- namespace Glom
- {
---- glom-1.6.8/glom/libglom/connectionpool.cc.orig	2008-02-15 12:27:23.000000000 +0100
-+++ glom-1.6.8/glom/libglom/connectionpool.cc	2008-02-15 12:27:55.000000000 +0100
-@@ -39,6 +39,7 @@
- #include <netinet/in.h> //For sockaddr_in
- 
- #include <signal.h> //To catch segfaults
-+#include <cstring>
- 
- #include "gst-package.h"
- 
---- glom-1.6.8/glom/libglom/document/document_glom.h.orig	2008-02-15 12:27:39.000000000 +0100
-+++ glom-1.6.8/glom/libglom/document/document_glom.h	2008-02-15 12:24:32.000000000 +0100
-@@ -40,6 +40,7 @@
- #include <gtkmm/window.h>
- #include <vector>
- #include <map>
-+#include <limits>
- 
- namespace Glom
- {
---- glom-1.6.8/glom/libglom/data_structure/glomconversions.cc.orig	2008-02-15 12:15:55.000000000 +0100
-+++ glom-1.6.8/glom/libglom/data_structure/glomconversions.cc	2008-02-15 12:16:55.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <ctime>     // for struct tm
- #include <iostream>   // for cout, endl
- #include <iomanip>
-+#include <cstring>
- 
- 
- namespace Glom
diff --git a/glom.spec b/glom.spec
index 4ba8f82..d753187 100644
--- a/glom.spec
+++ b/glom.spec
@@ -1,5 +1,5 @@
 %define major_version  1.6
-%define minor_version  15
+%define minor_version  17
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -10,7 +10,6 @@ Group:          Applications/Databases
 License:        GPLv2+
 URL:            http://www.glom.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
-Patch0:         glom-1.6.8-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bakery-devel >= 2.4.3
@@ -56,7 +55,6 @@ buttons. Glom uses the PostgreSQL database backend.
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc43
 
 
 %build
@@ -126,6 +124,10 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Tue Jun 17 2008 Denis Leroy <denis@poolshark.org> - 1.6.17-1
+- Update to 1.6.17
+- gcc 4.3 patch upstreamed
+
 * Tue May  6 2008 Denis Leroy <denis@poolshark.org> - 1.6.15-1
 - Update to upstream 1.6.15, fixes connection issue
 
diff --git a/sources b/sources
index 7096163..9bd4909 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-734ef241098083ef7372461d3568fcb8  glom-1.6.15.tar.bz2
+5629e1db63420a7afacfd0e110d7a1dc  glom-1.6.17.tar.bz2