- updated to 3.0.5.33220

[packages/Firebird.git] / Firebird.spec

diff --git a/Firebird.spec b/Firebird.spec
index 84aef7404d6b89e0c1886bd54e0af53a85f44847..cbde1d436ed0b5f77409408b2bf828ccd5beb5b1 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -15,13 +15,13 @@ Summary:    Firebird SQL Database Server and Client tools
 Summary(de.UTF-8):     Firebird - relationalen Open-Source- Datenbankmanagementsystems
 Summary(pl.UTF-8):     Firebird - serwer baz danych SQL oraz narzędzia klienckie
 Name:          Firebird
-Version:       3.0.4.33054
+Version:       3.0.5.33220
 Release:       1
 License:       Interbase Public License 1.0, Initial Developer's Public License 1.0
 Group:         Applications/Databases
-Source0:       https://github.com/FirebirdSQL/firebird/releases/download/R3_0_4/%{name}-%{version}-0.tar.bz2
-# Source0-md5: 43569120299b2db7587dcfbddab1e25a
-Source1:       http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/Firebird-3-QuickStart.pdf
+Source0:       https://github.com/FirebirdSQL/firebird/releases/download/R3_0_5/%{name}-%{version}-0.tar.bz2
+# Source0-md5: 4844be811fd4022d68f530eac75bd5b8
+Source1:       http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/%{name}-3-QuickStart.pdf
 # Source1-md5: 8e029d449e9cb3e1da8213ac6c11ad02
 # distfiles refuses this, would require some audit to allow '('/')' chars
 #Source2:      http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
@@ -49,6 +49,7 @@ Source105:    firebird-classic.service
 Source106:     firebird-classic.socket
 Source107:     server_mode-ss.conf
 Source108:     server_mode-classic.conf
+Source109:     fb_config
 Patch0:                %{name}-chmod.patch
 Patch1:                %{name}-editline.patch
 Patch2:                %{name}-va.patch
@@ -56,11 +57,13 @@ Patch3:             %{name}-FHS.patch
 Patch4:                %{name}-opt.patch
 Patch5:                %{name}-gcc-icu.patch
 Patch6:                %{name}-libpath.patch
+Patch7:                add-pkgconfig-files.patch
 Patch8:                Provide-sized-global-delete-operators-when-compiled.patch
 Patch9:                parallel-build.patch
 Patch10:       no-copy-from-icu.patch
 Patch11:       config.patch
 Patch12:       chown.patch
+Patch13:       cloop-honour-build-flags.patch
 URL:           http://www.firebirdsql.org/
 BuildRequires: autoconf >= 2.67
 BuildRequires: automake
@@ -194,18 +197,20 @@ Skrypty startowe Firebirda w wersji Classic (inetd).
 %patch4 -p1
 %patch5 -p0
 %patch6 -p1
+%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -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
+%{__sed} -i -e 's;^\(CC\|LINKER\)\(.*= \)gcc$;\1\2 %{__cc};' extern/btyacc/Makefile
 
 %build
 %{__libtoolize}
@@ -237,7 +242,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C src -f ../gen/Makefile.install buildImageDir
 
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/{firebird{,/conf.d},rc.d/init.d,sysconfig/rc-inetd}
-install -d $RPM_BUILD_ROOT{%{_bindir},%{ibdir},%{_libdir},%{_includedir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{ibdir},%{_libdir},%{_includedir},%{_pkgconfigdir}} \
 install -d $RPM_BUILD_ROOT/var/{log,lib/firebird} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
@@ -245,6 +250,8 @@ install -d $RPM_BUILD_ROOT%{systemdunitdir}
 cp -p %{SOURCE103} $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/firebird.conf
 touch $RPM_BUILD_ROOT/var/log/firebird.log
 
+cp -p gen/install/misc/fbclient.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
+
 cd gen/buildroot
 cp -p var/lib/firebird/security3.fdb $RPM_BUILD_ROOT/var/lib/firebird
 cp -p etc/firebird/*.conf $RPM_BUILD_ROOT%{_sysconfdir}/firebird
@@ -271,7 +278,7 @@ rm -f $RPM_BUILD_ROOT%{ibdir}/bin/{FirebirdUninstall.sh,changeServerMode.sh}
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE100} >$RPM_BUILD_ROOT/etc/rc.d/init.d/firebird
 cp -p %{SOURCE101} $RPM_BUILD_ROOT/etc/sysconfig/firebird
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE104} >$RPM_BUILD_ROOT%{systemdunitdir}/firebird.service
-install -d $RPM_BUILD_ROOT/var/run/firebird
+install -d $RPM_BUILD_ROOT/run/firebird
 
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE102} >$RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird
 sed -e 's|/usr/lib|%{_libdir}|' %{SOURCE105} >$RPM_BUILD_ROOT%{systemdunitdir}/firebird-classic@.service
@@ -279,6 +286,7 @@ cp -p %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/firebird-classic.socket
 
 cp -p %{SOURCE107} $RPM_BUILD_ROOT%{_sysconfdir}/firebird/conf.d/
 cp -p %{SOURCE108} $RPM_BUILD_ROOT%{_sysconfdir}/firebird/conf.d/
+install -p %{_sourcedir}/fb_config $RPM_BUILD_ROOT%{_bindir}/fb_config
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -395,10 +403,12 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/fb_config
 %attr(755,root,root) %{_libdir}/libfbclient.so
 %attr(755,root,root) %{ibdir}/bin/fb_config
 %attr(755,root,root) %{ibdir}/bin/gpre
 %attr(755,root,root) %{_bindir}/gpre
+%{_pkgconfigdir}/fbclient.pc
 %{_includedir}/firebird
 %{_includedir}/ib_util.h
 %{_includedir}/ibase.h
@@ -417,7 +427,7 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/firebird
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/tmpfiles.d/firebird.conf
 %attr(755,root,root) %{ibdir}/bin/fbguard
-%dir %attr(770,root,firebird) /var/run/firebird
+%dir %attr(770,root,firebird) /run/firebird
 %{systemdunitdir}/firebird.service
 
 %files classic