[firebird/el5/master] Update to new upstream 2.1.4

[Philippe Makowski]

commit 9f5a4f7ffb0a53d353a80152e2f09c385f09a2b8
Author: makowski <makowski at fedoraproject.org>
Date:   Wed Mar 16 15:13:41 2011 +0100

    Update to new upstream 2.1.4

 firebird-fix-CORE-3388.patch |   13 +++++++++++++
 firebird.spec                |   17 +++++++++++------
 sources                      |    2 +-
 3 files changed, 25 insertions(+), 7 deletions(-)
---
diff --git a/firebird-fix-CORE-3388.patch b/firebird-fix-CORE-3388.patch
new file mode 100644
index 0000000..d4c9066
--- /dev/null
+++ b/firebird-fix-CORE-3388.patch
@@ -0,0 +1,13 @@
+Index: src/jrd/scl.epp
+===================================================================
+--- src/jrd/scl.epp	(revision 52541)
++++ src/jrd/scl.epp	(working copy)
+@@ -141,7 +141,7 @@
+ 	{
+ 		ERR_post(isc_no_priv, isc_arg_string, "(ACL unrecognized)",
+ 				 isc_arg_string, "security_class",
+-				 isc_arg_string, s_class->scl_name,
++				 isc_arg_string, s_class->scl_name.c_str(),
+ 				 isc_arg_end);
+ 	}
+
diff --git a/firebird.spec b/firebird.spec
index 5cd8617..d2400f8 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,20 +1,19 @@
-%global pkgname Firebird-2.1.3.18185-0
+%global pkgname Firebird-2.1.4.18393-0
 %global fbroot	%{_libdir}/%{name}
-%global major	2.1.3
+%global major	2.1.4
 
 
 Summary:	SQL relational database management system
 Name:		firebird
-Version:	2.1.3.18185.0
-Release:	2%{?dist}
+Version:	2.1.4.18393.0
+Release:	1%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
 URL:		http://www.firebirdsql.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 
-#Source0:	http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
-Source0:	http://firebirdsql.org/downloads/prerelease/source/%{pkgname}.RC2.tar.bz2
+Source0:	http://downloads.sourceforge.net/firebird/%{pkgname}.tar.bz2
 Source1:	firebird-logrotate
 Source2:	README.Fedora
 
@@ -23,6 +22,7 @@ Patch0:		firebird-mcpu-to-mtune.patch
 Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
 Patch4:		firebird-gcc-icu.patch
+Patch5:     firebird-fix-CORE-3388.patch
 
 
 BuildRequires:	autoconf
@@ -133,6 +133,7 @@ iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/README.intl					-o	./doc/README.intl
 %patch0
 %patch3
 %patch4
+%patch5
 
 %build
 
@@ -522,6 +523,10 @@ fi
 
 
 %changelog
+* Wed Mar 16 2011 Philippe Makowski <makowski at fedoraproject.org>  2.1.4.18393.0-1
+- build with last upstream
+- fix upstream CORE-3388
+
 * Wed Aug 05 2009  Philippe Makowski <makowski at firebird-fr.eu.org> 2.1.3.18185.0-2
 - rename /usr/bin/gstat to /usr/bin/gstat-fb  to avoid conflict with ganglia-gmond (rh #515510)
 - remove stupid rm -rf in postun
diff --git a/sources b/sources
index 9083ef3..29fd59e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a419db70057767b7d6b955436e6e7089  Firebird-2.1.3.18185-0.RC2.tar.bz2
+1a236366546d9c8a4e90d0c048419947  Firebird-2.1.4.18393-0.tar.bz2