[soci/f14/master] - Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)

[Denis Arnaud]

commit 723076d185396d33f2044101be36004bf0f6a966
Author: Denis Arnaud <denis.arnaud_fedora at m4x.org>
Date:   Tue Sep 7 21:59:06 2010 +0200

    - Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)

 .gitignore |    1 +
 soci.spec  |   13 ++++++++++---
 sources    |    3 +++
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c314ab0..a47cd82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 soci-*.tar.*
 soci-*.src.rpm
+soci-*.*.*-*.patch
 .gitignore
 clog
 .build-*
diff --git a/soci.spec b/soci.spec
index fe7364d..a2962ed 100644
--- a/soci.spec
+++ b/soci.spec
@@ -18,7 +18,7 @@
 #
 Name:           soci
 Version:        3.0.0
-Release:        16%{?dist}
+Release:        17%{?dist}
 
 Summary:        The database access library for C++ programmers
 
@@ -30,12 +30,12 @@ Source0:        http://downloads.sourceforge.net/soci/%{name}-%{version}.tar.gz
 Patch0:         %{name}-%{version}-16-fix-gcc44-compatibility.patch
 # That patch will be submitted upstream
 Patch1:         %{name}-%{version}-16-fix-gnu-autotools-compatibility.patch
+# Patch fixing compilation bug (https://bugzilla.redhat.com/show_bug.cgi?id=631175):
+Patch2:         %{name}-%{version}-16-fix-make-tab.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel
-#BuildRequires:  cppunit-devel >= 1.10
 BuildRequires:  libtool
-#Requires:       
 
 %description
 SOCI is a C++ database access library that provides the
@@ -170,6 +170,9 @@ mv src %{name}
 # Apply the GNU Autotools compatibility patch
 %patch1 -p1
 
+# Apply the patch for the Make bug
+%patch2 -p0
+
 # Fix some permissions and formats
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
 chmod -x AUTHORS ChangeLog COPYING NEWS README
@@ -287,6 +290,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 07 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-17
+- Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)
+
 * Sat Jan 23 2010 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-16
 - Added a missing cstring header include for g++-4.4 compatibility
 
@@ -334,3 +340,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Fri Mar 27 2009 Denis Arnaud <denis.arnaud_fedora at m4x.org> 3.0.0-1
 - First RPM release
+
diff --git a/sources b/sources
index 291c586..1818f6d 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
 1bf7dd244764e53557c1ecc01fdfac96  soci-3.0.0.tar.gz
+65c1ca90695a11a687611cfdf9f7361c  soci-3.0.0-16-fix-gcc44-compatibility.patch
+e5e6200863e62a360f1fc77c2d56dd9b  soci-3.0.0-16-fix-gnu-autotools-compatibility.patch
+e7b935243b2116ec465755eb6593896f  soci-3.0.0-16-fix-make-tab.patch