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

[Philippe Makowski]

commit a7f07f142d538bfd3b8ef3690b90eb9d3ba7986d
Author: makowski <makowski at fedoraproject.org>
Date:   Wed Mar 16 14:41:22 2011 +0100

    Update to new upstream 2.1.4

 firebird-fix-CORE-3388.patch |   13 +++++++++++++
 firebird-gsec.patch          |   25 -------------------------
 firebird.spec                |   22 ++++++++++++++--------
 sources                      |    2 +-
 4 files changed, 28 insertions(+), 34 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 03d254f..a9f25df 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,12 +1,12 @@
-%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:	7%{?dist}
+Version:	2.1.4.18393.0
+Release:	1%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -18,12 +18,14 @@ Source1:	firebird-logrotate
 Source2:	README.Fedora
 
 Patch0:		firebird-mcpu-to-mtune.patch
-Patch1:		firebird-edit-fix.patch
+# not need
+# Patch1:		firebird-edit-fix.patch
 Patch2:		firebird-fix-initscript.patch
 Patch3:		firebird_lock-file-location.patch
 Patch4:		firebird-gcc-icu.patch
-Patch5:		firebird-s390x.patch
-Patch6:		firebird-gsec.patch
+# have to be updated
+# Patch5:		firebird-s390x.patch
+Patch6:     firebird-fix-CORE-3388.patch
 
 
 BuildRequires:	autoconf
@@ -135,7 +137,7 @@ iconv	-f	ISO-8859-1	-t	utf-8	-c	./doc/README.intl					-o	./doc/README.intl
 %patch0
 %patch3
 %patch4
-%patch5 -p1
+# %patch5 -p1
 %patch6
 
 %build
@@ -536,6 +538,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
+
 * Fri Mar 26 2010 Karsten Hopp <karsten at redhat.com> 2.1.3.18185.0-7
 - add configuration for 31bit s390
 
diff --git a/sources b/sources
index 5cafad5..29fd59e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec42bd5c85dc2f65baef185228bcc5ca  Firebird-2.1.3.18185-0.tar.bz2
+1a236366546d9c8a4e90d0c048419947  Firebird-2.1.4.18393-0.tar.bz2