- up to 2.5.1.26351; drop obsolete or unneded patches

[packages/Firebird.git] / Firebird.spec

diff --git a/Firebird.spec b/Firebird.spec
index 3cbcee7799346d904ef17b89b3c231951d52e89c..7a17d8440f0c421a22ed6211995f763756625564 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -13,12 +13,12 @@ Summary(de.UTF-8):  Firebird - relationalen Open-Source- Datenbankmanagementsyste
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?
-Version:       2.5.0.26074
+Version:       2.5.1.26351
 Release:       1
 License:       Interbase Public License 1.0, Initial Developer's Public License 1.0
 Group:         Applications/Databases
 Source0:       http://downloads.sourceforge.net/firebird/%{name}-%{version}-0.tar.bz2
-# Source0-md5: 780f162ee71f087fc277adf09f966529
+# Source0-md5: 1772fba4f09c8fc84d989282405f90fd
 Source1:       http://www.firebirdsql.org/pdfmanual/%{name}-2.5-QuickStart.pdf
 # Source1-md5: a7776f1eae45ba0b2543c203cd5271ae
 # distfiles refuses this, would require some audit to allow '('/')' chars
@@ -44,12 +44,11 @@ Source102:  firebird.inetd
 Patch0:                %{name}-chmod.patch
 Patch1:                %{name}-editline.patch
 Patch2:                %{name}-va.patch
-Patch3:                %{name}-morearchs.patch
+Patch3:                Firebird-fix-CORE-3388.patch
 Patch4:                %{name}-FHS.patch
-Patch5:                %{name}-64bit.patch
+
 Patch6:                %{name}-gcc-icu.patch
-Patch7:                %{name}-btyacc-segv.patch
-Patch8:                %{name}-opt.patch
+
 Patch9:                %{name}-rpath.patch
 Patch10:       %{name}-noroot.patch
 URL:           http://www.firebirdsql.org/
@@ -79,6 +78,7 @@ BuildRoot:    %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                ibdir   %{_libdir}/interbase
 %define                specflags       -fno-strict-aliasing
 %define                debugcflags     -O1 -g -Wall -fno-strict-aliasing
+%define                Werror_cflags   ''
 
 %description
 Firebird is a powerful, high-performance relational database designed
@@ -168,10 +168,9 @@ Obszerna dokumentacja do baz InterBase i Firebird.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
+
 %patch6 -p0
-%patch7 -p1
-%patch8 -p1
+
 %patch9 -p1
 %patch10 -p1
 
@@ -179,7 +178,7 @@ mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
 
 # not processed by configure
-%{__sed} -i -e 's/^CFLAGS.*$/& %{rpmcflags}/' extern/btyacc/Makefile
+%{__sed} -i -e 's/^CFLAGS.*$/& %{rpmcflags} %{rpmcppflags}/' extern/btyacc/Makefile
 %{__sed} -i -e 's/^\(CC\|LINKER\)\(.*= \)gcc$/\1\2 %{__cc}/' extern/btyacc/Makefile
 
 %build
@@ -222,7 +221,7 @@ touch $RPM_BUILD_ROOT/var/log/firebird.log
 cd gen/buildroot
 install var/lib/firebird/security2.fdb $RPM_BUILD_ROOT/var/lib/firebird
 install etc/firebird/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird
-cp -df usr/lib/*.so* $RPM_BUILD_ROOT%{_libdir}
+cp -df usr/%{_lib}/*.so* $RPM_BUILD_ROOT%{_libdir}
 cd .%{ibdir}
 install include/* $RPM_BUILD_ROOT%{_includedir}
 cp -af UDF bin help intl plugins firebird.msg de_DE.msg fr_FR.msg $RPM_BUILD_ROOT%{ibdir}