packages: Firebird/Firebird.spec - rel 2; fix x86_64 build

[arekm]

Author: arekm                        Date: Mon Nov  1 20:41:07 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; fix x86_64 build

---- Files affected:
packages/Firebird:
   Firebird.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: packages/Firebird/Firebird.spec
diff -u packages/Firebird/Firebird.spec:1.78 packages/Firebird/Firebird.spec:1.79
--- packages/Firebird/Firebird.spec:1.78	Fri Oct 29 19:21:07 2010
+++ packages/Firebird/Firebird.spec	Mon Nov  1 21:41:02 2010
@@ -15,7 +15,7 @@
 Name:		Firebird
 # FirebirdCS/FirebirdSS (Classic Server/Super Server)?
 Version:	2.5.0.26074
-Release:	1
+Release:	2
 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
@@ -180,7 +180,7 @@
 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
@@ -223,7 +223,7 @@
 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}
@@ -372,6 +372,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2010/11/01 20:41:02  arekm
+- rel 2; fix x86_64 build
+
 Revision 1.78  2010/10/29 17:21:07  qboosh
 - updated to 2.5.0
 - updated editline,morearchs,FHS,64bit,gcc-icu,opt,rpath patches
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Firebird/Firebird.spec?r1=1.78&r2=1.79&f=u