X-Git-Url: http://git.pld-linux.org/?p=packages%2FFirebird.git;a=blobdiff_plain;f=Firebird.spec;h=ea9fda505b1e5a6b117f9d409e9e8ff3a0aa27b2;hp=85275936f05a93a32cd9598b4edd4e1668ca9f91;hb=f5058bca0701d824e6c26b3b3fdf8d67abd1f0e7;hpb=6299ab26981051ab3fe81457dee7923ea04e6699

diff --git a/Firebird.spec b/Firebird.spec
index 8527593..ea9fda5 100644
--- 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
-Release:	2
+Version:	2.5.4.26856
+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:	7a17ec9889424b98baa29e001a054434
 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,14 +44,11 @@ Source102:	firebird.inetd
 Patch0:		%{name}-chmod.patch
 Patch1:		%{name}-editline.patch
 Patch2:		%{name}-va.patch
-Patch3:		%{name}-morearchs.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
+Patch3:		%{name}-FHS.patch
+Patch4:		%{name}-opt.patch
+Patch5:		%{name}-gcc-icu.patch
+Patch6:		%{name}-rpath.patch
+Patch7:		%{name}-noroot.patch
 URL:		http://www.firebirdsql.org/
 BuildRequires:	autoconf >= 2.56
 BuildRequires:	automake
@@ -73,12 +70,13 @@ Requires:	rc-scripts
 # official ports are x86, x86_64, ppc, sparc, arm, mips/mipsel, ia64
 # alpha is added in morearchs patch
 # see morearchs patch if you want more
-ExclusiveArch:	%{ix86} %{x8664} arm ia64 mips mipsel ppc sparc sparcv9 alpha
+ExclusiveArch:	%{ix86} %{x8664} x32 arm ia64 mips mipsel ppc sparc sparcv9 alpha
 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,12 +166,9 @@ Obszerna dokumentacja do baz InterBase i Firebird.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p0
+%patch5 -p0
+%patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
 
 mkdir docs
 cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs
@@ -226,6 +221,7 @@ 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}
+ln -s %{ibdir}/intl $RPM_BUILD_ROOT%{_sysconfdir}/firebird
 chmod 755 examples examples/{api,dyn,include,stat,udf} # allow further cleaning
 cp -rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -243,7 +239,7 @@ done
 install %{SOURCE100} $RPM_BUILD_ROOT/etc/rc.d/init.d/firebird
 install %{SOURCE101} $RPM_BUILD_ROOT/etc/sysconfig/firebird
 %else
-install %{SOURCE102} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird
+sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE102} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird
 %endif
 
 %clean