X-Git-Url: http://git.pld-linux.org/?p=packages%2FFirebird.git;a=blobdiff_plain;f=Firebird.spec;h=cb1e3367fffa930af06e5bb19263f6c4b6daa472;hp=b057a9ae04ed2fdaf2c4a7f7c74f9c7c7f92b5fc;hb=18cef8253f4fa15a30e1c481789c1475c88bd7aa;hpb=cc466a1c0107575d3c3f4555d87b241e1f626c26

diff --git a/Firebird.spec b/Firebird.spec
index b057a9a..cb1e336 100644
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -1,81 +1,93 @@
 # TODO:
+# - check running
+# - 2.5 -> 3.0 migration?
+# - more docs from http://www.firebirdsql.org/en/reference-manuals/ ?
 # - kill unaligned accesses (create_db,gpre_current,gbak_static,isql_static) on alpha
-# - create classic server/super server subpackages and drop bcond
-#   (see firebird2 on debian how to do it)
-#
-# Conditional build:
-%bcond_with	ss	# Super Server (standalone daemon instead of inetd service)
+#   - check if it's fixed now (RISC_ALIGNMENT is defined)
+# - check classic subpackage pre/post scripts
+# - logrotate script
+# - create SYSDBA user with initial password before first firebird start
+#   eg.:
+#     su firebird
+#     echo "create user SYSDBA password 'masterkey';"|fb_isql -u SYSDBA /var/lib/firebird/security3.fdb
 #
 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
-# FirebirdCS/FirebirdSS (Classic Server/Super Server)?
-Version:	2.1.0.17798
+Version:	3.0.2.32703
 Release:	1
-License:	Interbase Public License 1.0
+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:	e663417416b4dc808d6ace991e6b783f
-Source1:	http://www.firebirdsql.org/pdfmanual/Firebird-2.0-QuickStart.pdf
-# Source1-md5:	d77105c5b24202fe7adbf2a011e71b35
-Source2:	http://www.firebirdsql.org/pdfmanual/Using-Firebird_(wip).pdf
-# Source2-md5:	9eb90583c200bdd7292a80ecc1df1178
-Source3:	http://www.firebirdsql.org/pdfmanual/Firebird-Null-Guide.pdf
+Source0:	http://downloads.sourceforge.net/firebird/%{name}-%{version}-0.tar.bz2
+# Source0-md5:	1fdc121ab04d2c2772d778e45ecd5689
+Source1:	http://www.firebirdsql.org/file/documentation/reference_manuals/user_manuals/Firebird-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
+## Source2-md5:	9eb90583c200bdd7292a80ecc1df1178
+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-md5:	4e195bc085dba520b0f7cd9dcd1f995c
-Source7:	http://www.firebirdsql.org/pdfmanual/Firebird-Utils-WIP.pdf
+Source6:	http://www.firebirdsql.org/pdfmanual/%{name}-nbackup.pdf
+# Source6-md5:	7ef8a8b9a899d06bec2a5da0bb5fea0e
+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
+Source103:	firebird.tmpfiles
+Source104:	firebird.service
+Source105:	firebird-classic.service
+Source106:	firebird-classic.socket
+Source107:	server_mode-ss.conf
+Source108:	server_mode-classic.conf
 Patch0:		%{name}-chmod.patch
 Patch1:		%{name}-editline.patch
 Patch2:		%{name}-va.patch
-Patch3:		%{name}-morearchs.patch
-Patch4:		%{name}-gcc4.patch
-Patch5:		%{name}-fix-os-detection.dpatch
-Patch6:		%{name}-fix-pthreads-detect.dpatch
-Patch7:		%{name}-link-with-g++.dpatch
-Patch8:		%{name}-no-custom-errno-and-sys_XXerrXX.dpatch
-Patch9:		%{name}-opt-bypass-redundant-sort.dpatch
-Patch10:	%{name}-security-remote-preauth-crash.dpatch
-Patch11:	%{name}-separate-file-and-sem-perms.dpatch
-Patch12:	%{name}-ppc.patch
-Patch13:	%{name}-64bit.patch
+Patch3:		%{name}-FHS.patch
+Patch4:		%{name}-opt.patch
+Patch5:		%{name}-gcc-icu.patch
+Patch6:		%{name}-libpath.patch
+Patch7:		Make-the-generated-code-compatible-with-gcc-6-in-C-1.patch
+Patch8:		Provide-sized-global-delete-operators-when-compiled.patch
+Patch9:		parallel-build.patch
+Patch10:	no-copy-from-icu.patch
+Patch11:	config.patch
 URL:		http://www.firebirdsql.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.67
 BuildRequires:	automake
 BuildRequires:	bison
+BuildRequires:	libatomic_ops
+BuildRequires:	libedit-devel
 BuildRequires:	libicu-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool
-BuildRequires:	ncurses-devel
-BuildRequires:	psmisc >= 22.5-2
+BuildRequires:	libtommath-devel
+BuildRequires:	libtool >= 2:2
+# for lockfile
+BuildRequires:	procmail
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	sed >= 4.0
+BuildRequires:	zlib-devel
+Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	%{name}-lib = %{version}-%{release}
-%if %{with ss}
-Requires(post,preun):	/sbin/chkconfig
-Requires:	rc-scripts
-%endif
-# official ports are x86, sparc and x86_64
-# alpha and ppc added in morearchs patch
-# see morearchs patch if you want to add support for more archs
-ExclusiveArch:	%{ix86} %{x8664} sparc sparcv9 alpha ppc
+# 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} 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
@@ -99,6 +111,17 @@ Bugfix-Version mit nur wenigen Erweiterungen angesehen werden kann.
 Eine Erweiterung von Firebird 1.0 ist der 64-Bit File I/O, so dass
 auch Datenbankdateien über 2GB erzeugt werden können.
 
+%package dirs
+Summary:	Firebird SQL Database common directories
+Summary(pl.UTF-8):	Firebird - wspólne katalogi
+Group:		Applications/Databases
+
+%description dirs
+Firebird SQL Database common directories.
+
+%description dirs -l pl.UTF-8
+Firebird - wspólne katalogi.
+
 %package lib
 Summary:	Firebird shared library
 Summary(pl.UTF-8):	Biblioteka współdzielona Firebird
@@ -114,8 +137,10 @@ Biblioteka współdzielona Firebird (libgds).
 Summary:	Header files for Firebird library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki Firebird
 Group:		Development/Libraries
+Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	%{name}-lib = %{version}-%{release}
 Requires:	libstdc++-devel
+Obsoletes:	Firebird-static
 
 %description devel
 Header files for Firebird library.
@@ -123,18 +148,6 @@ Header files for Firebird library.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki Firebird.
 
-%package static
-Summary:	Static Firebird library
-Summary(pl.UTF-8):	Statyczna biblioteka Firebird
-Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static Firebird library (libgds).
-
-%description static -l pl.UTF-8
-Statyczna biblioteka Firebird (libgds).
-
 %package doc
 Summary:	Extensive InterBase and Firebird documentation
 Summary(pl.UTF-8):	Obszerna dokumentacja do baz InterBase i Firebird
@@ -146,28 +159,53 @@ Extensive InterBase and Firebird documentation.
 %description doc -l pl.UTF-8
 Obszerna dokumentacja do baz InterBase i Firebird.
 
+%package ss
+Summary:	Firebird SuperServer init scripts
+Summary(pl.UTF-8):	Skrypty startowe Firebirda jako SuperServera
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+Requires(post,preun):	/sbin/chkconfig
+Requires:	rc-scripts
+
+%description ss
+Firebird SuperServer init scripts.
+
+%description ss -l pl.UTF-8
+Skrypty startowe Firebirda jako SuperServera.
+
+%package classic
+Summary:	Firebird Classic init scripts
+Summary(pl.UTF-8):	Skrypty startowe Firebirda w wersji Classic
+Group:		Daemons
+Requires:	%{name} = %{version}-%{release}
+
+%description classic
+Firebird Classic (inetd) init scripts.
+
+%description classic -l pl.UTF-8
+Skrypty startowe Firebirda w wersji Classic (inetd).
+
 %prep
-%setup -q -n Firebird-%{version}-0
+%setup -q -n %{name}-%{version}-0
 %patch0 -p1
-# OBSOLETE?
-# %patch1 -p1
-# ???
-# %patch2 -p1
-# looks obsolete (but not fully)
-# %patch3 -p1
-# %patch4 -p1
-# %patch5 -p1
-# %patch6 -p1
-# %patch7 -p1
-# %patch8 -p1
-# %patch9 -p1
-# %patch10 -p1
-# %patch11 -p1
-# %patch12 -p1
-# %patch13 -p1
-
-# force rebuild
-rm -f src/dsql/parse.cpp
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p0
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -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}
@@ -175,79 +213,72 @@ rm -f src/dsql/parse.cpp
 %{__autoconf}
 
 %configure \
-	--with-editline \
+	CFLAGS="%{rpmcflags} -fno-delete-null-pointer-checks" \
+	--prefix=%{ibdir} \
 	--with-system-editline \
-	--with-system-icu \
+	--with-fbconf=%{_sysconfdir}/firebird \
+	--with-fbinclude=%{_includedir} \
+	--with-fblib=%{_libdir} \
+	--with-fblog=/var/log \
+	--with-fbsecure-db=/var/lib/firebird \
+	--with-fbglock=/var/lib/firebird \
 	--with-gnu-ld \
-	%{?with_ss:--enable-superserver} \
-	--prefix=%{ibdir} \
-	%{?debug:--enable-debug}
-
-# OPTFLAGS for editline
-export OPTFLAGS="%{rpmcflags}"
-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"
-
-# my name is hack. dirty hack.
-# why isn't that build in previous make call?
-%{__make} -C src -f ../gen/Makefile.libfbembed libfbembed \
-	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"
-
-# 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 || :
+	--with-gpre-pascal \
+	--with-system-editline \
+	%{?debug:--enable-debug} \
+	--disable-rpath \
+	--disable-binreloc
+
+%{__make} -j1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} -C src -f ../gen/Makefile.install buildImageDir
 
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig/rc-inetd}
-install -d $RPM_BUILD_ROOT{%{ibdir},%{_libdir},%{_includedir}} \
+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/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}
-cd gen/buildroot/%{ibdir}
-
-cp -af UDF bin help intl aliases.conf firebird.conf firebird.msg security.fdb \
-	$RPM_BUILD_ROOT%{ibdir}
-install include/* $RPM_BUILD_ROOT%{_includedir}
-cp -df lib/* $RPM_BUILD_ROOT%{_libdir}
-install examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
-
-# or libfbembed?
-ln -sf libfbclient.so.1 $RPM_BUILD_ROOT%{_libdir}/libgds.so.0
-ln -sf libfbclient.so.1 $RPM_BUILD_ROOT%{_libdir}/libgds.so
-
-ln -sf libfbstatic.a $RPM_BUILD_ROOT%{_libdir}/libgds.a
-
-%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
-%endif
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+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
+
+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
+chmod 755 usr/include/firebird/impl
+cp -pr usr/include/* $RPM_BUILD_ROOT%{_includedir}
+cp -dp usr/%{_lib}/*.so* $RPM_BUILD_ROOT%{_libdir}
+cd .%{ibdir}
+cp -a UDF bin help intl plugins firebird.msg $RPM_BUILD_ROOT%{ibdir}
+ln -s %{ibdir}/intl $RPM_BUILD_ROOT%{_sysconfdir}/firebird
+ln -s %{ibdir}/{UDF,bin,plugins,firebird.msg} $RPM_BUILD_ROOT%{_sysconfdir}/firebird
+chmod u+w -R examples # allow further cleaning
+cp -rf examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+ln -sf libfbclient.so.2 $RPM_BUILD_ROOT%{_libdir}/libgds.so.0
+ln -sf libfbclient.so.2 $RPM_BUILD_ROOT%{_libdir}/libgds.so
+
+for f in bin/{fb_lock_print,gbak,gfix,gpre,gsec,gsplit,gstat,nbackup}; do
+	ln -sf %{ibdir}/$f $RPM_BUILD_ROOT%{_bindir}/${f#bin/}
+done
+ln -sf %{ibdir}/bin/isql $RPM_BUILD_ROOT%{_bindir}/fb_isql
+
+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
+
+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
+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/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -256,55 +287,105 @@ rm -rf $RPM_BUILD_ROOT
 %groupadd -g 145 firebird
 %useradd -u 145 -d %{ibdir} -s /bin/sh -g firebird -c "Firebird Server" firebird
 
-%if %{with ss}
-%post
+%postun
+if [ "$1" = "0" ]; then
+	%userremove firebird
+	%groupremove firebird
+fi
+
+%post	lib -p /sbin/ldconfig
+%postun	lib -p /sbin/ldconfig
+
+%post ss
 /sbin/chkconfig --add firebird
 %service firebird restart
+%systemd_post firebird.service
 
-%preun
+%preun ss
 if [ "$1" = "0" ]; then
 	%service firebird stop
 	/sbin/chkconfig --del firebird
 fi
-%endif
+%systemd_preun firebird.service
 
-%postun
-if [ "$1" = "0" ]; then
-	%userremove firebird
-	%groupremove firebird
-fi
+%postun ss
+%systemd_reload
 
-%post	lib -p /sbin/ldconfig
-%postun	lib -p /sbin/ldconfig
+%post classic
+%systemd_post firebird-classic@.service firebird-classic.socket
+
+%preun classic
+%systemd_preun firebird-classic@.service firebird-classic.socket
+
+%postun classic
+%systemd_reload
+
+%triggerpostun -- %{name} < 2.1.1.17910-2
+if [ -f %{ibdir}/firebird.conf.rpmsave ]; then
+	mv -f %{ibdir}/firebird.conf.rpmsave %{_sysconfdir}/firebird/firebird.conf
+fi
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}
+%doc doc/{license,sql.extensions,Firebird_conf.txt,README.user*,WhatsNew,fb2-todo.txt}
+%dir %{_sysconfdir}/firebird
+%dir %{_sysconfdir}/firebird/conf.d
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/databases.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(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/plugins.conf
+%{_sysconfdir}/firebird/intl
+%{_sysconfdir}/firebird/UDF
+%{_sysconfdir}/firebird/bin
+%{_sysconfdir}/firebird/firebird.msg
+%{_sysconfdir}/firebird/plugins
+%attr(755,root,root) %{_bindir}/fb_isql
+%attr(755,root,root) %{_bindir}/fb_lock_print
+%attr(755,root,root) %{_bindir}/gbak
+%attr(755,root,root) %{_bindir}/gfix
+%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
-%dir %attr(770,root,firebird) %{ibdir}
 %attr(755,root,root) %{ibdir}/UDF
-%attr(755,root,root) %{ibdir}/bin
+%attr(755,root,root) %{ibdir}/bin/*
+%exclude %{ibdir}/bin/fb_config
+%exclude %{ibdir}/bin/gpre
+%exclude %{ibdir}/bin/fbguard
 %{ibdir}/help
 %dir %attr(770,root,firebird) %{ibdir}/intl
 %attr(755,root,root) %{ibdir}/intl/fbintl
+# 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
+%attr(755,root,root) %{ibdir}/plugins/libCryptKeyHolder_example.so
+%attr(755,root,root) %{ibdir}/plugins/libDbCrypt_example.so
+%attr(755,root,root) %{ibdir}/plugins/libEngine12.so
+%attr(755,root,root) %{ibdir}/plugins/libLegacy_Auth.so
+%attr(755,root,root) %{ibdir}/plugins/libLegacy_UserManager.so
+%attr(755,root,root) %{ibdir}/plugins/libSrp.so
+%attr(755,root,root) %{ibdir}/plugins/libudr_engine.so
+%dir %{ibdir}/plugins/udr
+%attr(755,root,root) %{ibdir}/plugins/udr/libudrcpp_example.so
+%{ibdir}/plugins/udr_engine.conf
+
 %{ibdir}/firebird.msg
-# following files should be in /var (*.fdb) and /etc (*.conf)?
-%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{ibdir}/security.fdb
-%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{ibdir}/aliases.conf
-%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{ibdir}/firebird.conf
-%if %{with ss}
-%attr(754,root,root) /etc/rc.d/init.d/firebird
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/firebird
-%else
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/firebird
-%endif
+%dir %attr(770,root,firebird) /var/lib/firebird
+%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/lib/firebird/security3.fdb
+%attr(660,root,firebird) %config(noreplace) %verify(not md5 mtime size) /var/log/firebird.log
+
+
+%files dirs
+%defattr(644,root,root,755)
+%dir %{ibdir}
+%dir %{ibdir}/bin
 
 %files lib
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfbclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfbclient.so.[0-9]
-%attr(755,root,root) %{_libdir}/libfbembed.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfbembed.so.[0-9]
+%attr(755,root,root) %ghost %{_libdir}/libfbclient.so.2
 
 # InterBase/old Firebird compatibility symlinks
 %attr(755,root,root) %{_libdir}/libgds.so.0
@@ -315,17 +396,33 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfbclient.so
-%attr(755,root,root) %{_libdir}/libfbembed.so
-%{_includedir}/*.h
+%attr(755,root,root) %{ibdir}/bin/fb_config
+%attr(755,root,root) %{ibdir}/bin/gpre
+%attr(755,root,root) %{_bindir}/gpre
+%{_includedir}/firebird
+%{_includedir}/ib_util.h
+%{_includedir}/ibase.h
+%{_includedir}/iberror.h
+%{_includedir}/perf.h
 %{_examplesdir}/%{name}-%{version}
 
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libfbcommon.a
-%{_libdir}/libfbstatic.a
-# compat link
-%{_libdir}/libgds.a
-
 %files doc
 %defattr(644,root,root,755)
 %doc docs/*
+
+%files ss
+%defattr(644,root,root,755)
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/conf.d/server_mode-ss.conf
+%attr(754,root,root) /etc/rc.d/init.d/firebird
+%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
+%{systemdunitdir}/firebird.service
+
+%files classic
+%defattr(644,root,root,755)
+%attr(640,root,firebird) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/firebird/conf.d/server_mode-classic.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/firebird
+%{systemdunitdir}/firebird-classic@.service
+%{systemdunitdir}/firebird-classic.socket