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

Philippe Makowski makowski at fedoraproject.org
Wed Mar 16 12:42:59 UTC 2011


commit 7cb3712fd8e5c10f29409928e869a74e7ec4fc5b
Author: makowski <makowski at fedoraproject.org>
Date:   Wed Mar 16 13:42:57 2011 +0100

    Update to new upstream 2.1.4

 .gitignore          |    1 +
 firebird-gsec.patch |   25 -------------------------
 firebird.spec       |   20 ++++++++++----------
 sources             |    2 +-
 4 files changed, 12 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c91e693..c32443b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Firebird-2.1.3.18185-0.RC2.tar.bz2
+/Firebird-2.1.4.18393-0.tar.bz2
diff --git a/firebird.spec b/firebird.spec
index f961bca..33ad262 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,12 +1,11 @@
-%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:	9%{?dist}
+Version:	2.1.4.18393.0
+Release:	1%{?dist}
 
 Group:		Applications/Databases
 License:	Interbase
@@ -18,13 +17,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
 BuildRequires:	automake
@@ -138,7 +138,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
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


More information about the scm-commits mailing list