X-Git-Url: http://git.pld-linux.org/?p=packages%2FFirebird.git;a=blobdiff_plain;f=Firebird.spec;h=241cccc9f5514dce5c5077ec4eae19275fd87d81;hp=7b2bc3b3e6979d00d7b027bf14626fce008ea34b;hb=50d0d780546fffffb72fa462d01c6551d40e4806;hpb=befcf9eb181a3bfb37d40ccda1fd4ab73e233eac diff --git a/Firebird.spec b/Firebird.spec index 7b2bc3b..241cccc 100644 --- a/Firebird.spec +++ b/Firebird.spec @@ -13,50 +13,54 @@ 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.1.2.18118 -Release: 1 +Version: 2.5.4.26856 +Release: 2 License: Interbase Public License 1.0, Initial Developer's Public License 1.0 Group: Applications/Databases -Source0: http://dl.sourceforge.net/firebird/Firebird-%{version}-0.tar.bz2 -# Source0-md5: 063b3825a06d328f726b733fd74614b1 -Source1: http://www.firebirdsql.org/pdfmanual/Firebird-2.1-QuickStart.pdf -# Source1-md5: 46bb1af4b94e8c8acee1d6ef2055b2d3 +Source0: http://downloads.sourceforge.net/firebird/%{name}-%{version}-0.tar.bz2 +# 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 #Source2: http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf ## Source2-md5: 9eb90583c200bdd7292a80ecc1df1178 -Source3: http://www.firebirdsql.org/pdfmanual/Firebird-Null-Guide.pdf +Source3: http://www.firebirdsql.org/pdfmanual/%{name}-Null-Guide.pdf # Source3-md5: d1f8ba75fe3bb9eb9d203ce3f82a1a1a -Source4: http://www.firebirdsql.org/pdfmanual/Firebird-Generator-Guide.pdf +Source4: http://www.firebirdsql.org/pdfmanual/%{name}-Generator-Guide.pdf # Source4-md5: 44e7568ef477072a8ad5f381c3e12a75 -Source5: http://www.firebirdsql.org/pdfmanual/MSSQL-to-Firebird.pdf +Source5: http://www.firebirdsql.org/pdfmanual/MSSQL-to-%{name}.pdf # Source5-md5: 1bd4a168e550910fc899e2aa125d83a3 -Source6: http://www.firebirdsql.org/pdfmanual/Firebird-nbackup.pdf +Source6: http://www.firebirdsql.org/pdfmanual/%{name}-nbackup.pdf # Source6-md5: 7ef8a8b9a899d06bec2a5da0bb5fea0e -Source7: http://www.firebirdsql.org/pdfmanual/Firebird-Utils-WIP.pdf +Source7: http://www.firebirdsql.org/pdfmanual/%{name}-Utils-WIP.pdf # Source7-md5: 39b9a4f3c9d9e27d985e9277ae163ceb Source8: http://www.firebirdnews.org/docs/fb2min.pdf # Source8-md5: ebac312c0afbe97b1850bdc74c553c28 -Source9: http://www.firebirdsql.org/doc/contrib/fb_2_0_errorcodes.pdf -# Source9-md5: 2acf2ff63c4ba3a1c590989e19bb253e +Source9: http://www.firebirdsql.org/doc/contrib/fb_2_1_errorcodes.pdf +# Source9-md5: 9ab392dc349657dbcf9a9c35acd8e8db Source100: firebird.init Source101: firebird.sysconfig 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 +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 BuildRequires: bison +BuildRequires: libatomic_ops BuildRequires: libedit-devel BuildRequires: libicu-devel BuildRequires: libstdc++-devel BuildRequires: libtool BuildRequires: psmisc >= 22.5-2 BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: sed >= 4.0 Requires: %{name}-dirs = %{version}-%{release} Requires: %{name}-lib = %{version}-%{release} %if %{with ss} @@ -66,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 @@ -155,20 +160,23 @@ Extensive InterBase and Firebird documentation. Obszerna dokumentacja do baz InterBase i Firebird. %prep -%setup -q -n Firebird-%{version}-0 +%setup -q -n %{name}-%{version}-0 %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 - -# force rebuild -rm -f src/dsql/parse.cpp +%patch5 -p0 +%patch6 -p1 +%patch7 -p1 mkdir docs cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} docs +# not processed by configure +%{__sed} -i -e 's/^CFLAGS.*$/& %{rpmcflags} %{rpmcppflags}/' extern/btyacc/Makefile +%{__sed} -i -e 's/^\(CC\|LINKER\)\(.*= \)gcc$/\1\2 %{__cc}/' extern/btyacc/Makefile + %build %{__libtoolize} %{__aclocal} @@ -176,6 +184,10 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %configure \ --with-editline \ + --with-fbconf=%{_sysconfdir}/firebird \ + --with-fblib=%{_libdir} \ + --with-fblog=/var/log \ + --with-fbsecure-db=/var/lib/firebird \ --with-gnu-ld \ --with-gpre-pascal \ --with-system-editline \ @@ -184,24 +196,7 @@ cp %{SOURCE1} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} --prefix=%{ibdir} \ %{?debug:--enable-debug} -DARCH="" -%ifarch %{x8664} -DARCH="-DAMD64" -%endif -%ifarch sparc sparcv9 -DARCH="-Dsparc" -%endif -%ifarch ppc -DARCH="-DPPC" -%endif - -%{__make} -j1 \ - CC="%{__cc}" \ - CXX="%{__cxx}" \ - PROD_FLAGS="%{rpmcflags} -DNDEBUG -DLINUX -pipe -MMD -fPIC $DARCH" \ - DEV_FLAGS="%{rpmcflags} -DLINUX -DDEBUG_GDS_ALLOC -pipe -MMD -fPIC -Wall -Wno-switch $DARCH" \ - LIB_LINK_RPATH_LINE= \ - LIB_CLIENT_LINK_OPTIONS="-lpthread" +%{__make} -j1 # fb_lock_mgr is started during build - try to stop it (if /proc is mounted...) fuser -k gen/firebird/bin/fb_lock_mgr 2>/dev/null || : @@ -211,21 +206,23 @@ rm -rf $RPM_BUILD_ROOT %{__make} -C src -f ../gen/Makefile.install buildImageDir -install -d $RPM_BUILD_ROOT/etc/{firebird,rc.d/init.d,sysconfig/rc-inetd} -install -d $RPM_BUILD_ROOT{%{ibdir},%{_libdir},%{_includedir}} \ +install -d $RPM_BUILD_ROOT%{_sysconfdir}/{firebird,rc.d/init.d,sysconfig/rc-inetd} +install -d $RPM_BUILD_ROOT{%{_bindir},%{ibdir},%{_libdir},%{_includedir}} \ install -d $RPM_BUILD_ROOT/var/{log,lib/firebird} \ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} install gen/firebird/lib/libfb*.a $RPM_BUILD_ROOT%{_libdir} -install gen/firebird/lib/libfbembed.so* $RPM_BUILD_ROOT%{_libdir} touch $RPM_BUILD_ROOT/var/log/firebird.log -cd gen/buildroot/%{ibdir} -install security2.fdb $RPM_BUILD_ROOT/var/lib/firebird -install *.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird +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} +cd .%{ibdir} install include/* $RPM_BUILD_ROOT%{_includedir} -cp -af UDF bin help intl firebird.msg $RPM_BUILD_ROOT%{ibdir} -cp -df lib/* $RPM_BUILD_ROOT%{_libdir} +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} # or libfbembed? @@ -234,11 +231,15 @@ ln -sf libfbclient.so.2 $RPM_BUILD_ROOT%{_libdir}/libgds.so ln -sf libfbstatic.a $RPM_BUILD_ROOT%{_libdir}/libgds.a +for f in bin/{fb_lock_print,gbak,gdef,gfix,gpre,gsec,gsplit,gstat,nbackup}; do + ln -sf %{ibdir}/$f $RPM_BUILD_ROOT%{_bindir}/${f#bin/} +done + %if %{with ss} 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 @@ -284,7 +285,18 @@ fi %defattr(644,root,root,755) %doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt} %dir %{_sysconfdir}/firebird -%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/*.conf +%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/aliases.conf +%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/fbtrace.conf +%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/firebird.conf +%attr(755,root,root) %{_bindir}/fb_lock_print +%attr(755,root,root) %{_bindir}/gbak +%attr(755,root,root) %{_bindir}/gdef +%attr(755,root,root) %{_bindir}/gfix +%attr(755,root,root) %{_bindir}/gpre +%attr(755,root,root) %{_bindir}/gsec +%attr(755,root,root) %{_bindir}/gsplit +%attr(755,root,root) %{_bindir}/gstat +%attr(755,root,root) %{_bindir}/nbackup %attr(755,root,root) %{_libdir}/libib_util.so %attr(755,root,root) %{ibdir}/UDF %attr(755,root,root) %{ibdir}/bin/* @@ -292,9 +304,13 @@ fi %{ibdir}/help %dir %attr(770,root,firebird) %{ibdir}/intl %attr(755,root,root) %{ibdir}/intl/fbintl -# should it be moved to /etc and marked as config? +# should it be moved to %{_sysconfdir} and marked as config? %{ibdir}/intl/fbintl.conf +%dir %{ibdir}/plugins +%attr(755,root,root) %{ibdir}/plugins/libfbtrace.so %{ibdir}/firebird.msg +%lang(de) %{ibdir}/de_DE.msg +%lang(fr) %{ibdir}/fr_FR.msg %dir %attr(770,root,firebird) /var/lib/firebird %attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security2.fdb %attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/log/firebird.log @@ -316,7 +332,7 @@ fi %attr(755,root,root) %{_libdir}/libfbclient.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libfbclient.so.2 %attr(755,root,root) %{_libdir}/libfbembed.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libfbembed.so.2.1 +%attr(755,root,root) %ghost %{_libdir}/libfbembed.so.2.5 # InterBase/old Firebird compatibility symlinks %attr(755,root,root) %{_libdir}/libgds.so.0