[rpms/soci] update-to-4.1.4: - Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)

[rpms/soci] update-to-4.1.4: - Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)

[Denis Arnaud]

A new commit has been pushed.

Repo   : rpms/soci
Branch : update-to-4.1.4
Commit : 04a049ca735ce12fe702377d7dd1f2128617b48e
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date   : 2010-09-07T21:40:55+02:00
Stats  : +14/-3 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/soci/c/04a049ca735ce12fe702377d7dd1f2128617b48e?branch=update-to-4.1.4

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

---
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@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@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@m4x.org> 3.0.0-1
 - First RPM release
+

diff --git a/sources b/sources
index 291c586..6fd0abf 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
 1bf7dd244764e53557c1ecc01fdfac96  soci-3.0.0.tar.gz
+e7b935243b2116ec465755eb6593896f  soci-3.0.0-16-fix-make-tab.patch
+65c1ca90695a11a687611cfdf9f7361c  soci-3.0.0-16-fix-gcc44-compatibility.patch
+e5e6200863e62a360f1fc77c2d56dd9b  soci-3.0.0-16-fix-gnu-autotools-compatibility.patch

[rpms/soci] update-to-4.1.4: - Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)

[Denis Arnaud]

A new commit has been pushed.

Repo   : rpms/soci
Branch : update-to-4.1.4
Commit : af8a393219c3570d776b4228a859d2043241bf54
Author : Denis Arnaud <denis.arnaud_fedora@m4x.org>
Date   : 2010-09-08T05:44:54+02:00
Stats  : +4/-4 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/soci/c/af8a393219c3570d776b4228a859d2043241bf54?branch=update-to-4.1.4

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

---
diff --git a/soci.spec b/soci.spec
index a2962ed..afd9537 100644
--- a/soci.spec
+++ b/soci.spec
@@ -18,7 +18,7 @@
 #
 Name:           soci
 Version:        3.0.0
-Release:        17%{?dist}
+Release:        18%{?dist}
 
 Summary:        The database access library for C++ programmers
 
@@ -171,7 +171,7 @@ mv src %{name}
 %patch1 -p1
 
 # Apply the patch for the Make bug
-%patch2 -p0
+%patch2 -p1
 
 # Fix some permissions and formats
 find ./doc -type f -perm 755 -exec chmod 644 {} \;
@@ -290,7 +290,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Sep 07 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> 3.0.0-17
+* Tue Sep 07 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> 3.0.0-18
 - Fixed bug #631175 (https://bugzilla.redhat.com/show_bug.cgi?id=631175)
 
 * Sat Jan 23 2010 Denis Arnaud <denis.arnaud_fedora@m4x.org> 3.0.0-16

diff --git a/sources b/sources
index 6fd0abf..3704c3e 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 1bf7dd244764e53557c1ecc01fdfac96  soci-3.0.0.tar.gz
-e7b935243b2116ec465755eb6593896f  soci-3.0.0-16-fix-make-tab.patch
 65c1ca90695a11a687611cfdf9f7361c  soci-3.0.0-16-fix-gcc44-compatibility.patch
 e5e6200863e62a360f1fc77c2d56dd9b  soci-3.0.0-16-fix-gnu-autotools-compatibility.patch
+e2f9e1fdd88d623814579c252af9ff77  soci-3.0.0-16-fix-make-tab.patch