use ReleaseCandidate2

1 files changed, 53 insertions, 13 deletions

diff --git a/firebird.spec b/firebird.spec
index 25a5a13..d9ed010 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -1,18 +1,20 @@
-%global fbroot %{_libdir}/%{name}
+%global upversion 3.0.0.32366
+%global pkgversion Firebird-%{upversion}-ReleaseCandidate2
+
 %global major 3.0
 %global _hardened_build 1
 
 Summary: SQL relational database management system
 Name:  firebird
-Version: 3.0
-Release:        0%{?dist}
+Version: %{upversion}
+Release:        1%{?dist}
 
 Group:  Applications/Databases
 License: Interbase
 URL:  http://www.firebirdsql.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
-Source0:        firebird-92718125.tar.gz
+Source0:  %{pkgversion}.tar.bz2
 Source1:  firebird-logrotate
 Source2:  README.Fedora
 Source3:  firebird.conf
@@ -150,8 +152,23 @@ Firebird offers excellent concurrency, high performance, and powerful
 language support for stored procedures and triggers. It has been used
 in production systems, under a variety of names, since 1981.
 
+%package examples
+Group: Applications/Databases
+Requires: %{name}-doc = %{version}
+Summary: Examples for Firebird SQL server
+BuildArch: noarch
+
+%description examples
+Examples for Firebird SQL server.
+
+Firebird is a relational database offering many ANSI SQL standard
+features that runs on Linux, Windows, and a variety of Unix platforms.
+Firebird offers excellent concurrency, high performance, and powerful
+language support for stored procedures and triggers. It has been used
+in production systems, under a variety of names, since 1981.
+
 %prep
-%setup -q -n %{name}
+%setup -q -n %{pkgversion}
 %patch101 -p1
 %patch102 -p1
 %patch201 -p1
@@ -176,7 +193,7 @@ NOCONFIGURE=1 ./autogen.sh
   --with-fbhelp=%{_localstatedir}/lib/%{name}/system/ \
   --with-fbintl=%{_libdir}/%{name}/intl \
   --with-fbmisc=%{_datadir}/%{name}/misc \
-  --with-fbsecure-db=%{_localstatedir}/lib/%{name}/system/ \
+  --with-fbsecure-db=%{_localstatedir}/lib/%{name}/secdb/ \
   --with-fbmsg=%{_localstatedir}/lib/%{name}/system/ \
   --with-fblog=%{_localstatedir}/log/%{name} \
   --with-fbglock=%{_var}/run/%{name} \
@@ -203,6 +220,7 @@ rm -vf .%{_libdir}/libicu*.so
 rm -vf .%{_includedir}/*.h
 chmod -R u+w .%{_docdir}/%{name}
 rm -vf .%{_datadir}/%{name}/misc/firebird.init.*
+rm -vf .%{_datadir}/%{name}/misc/firebird.xinetd
 rm -vf .%{_datadir}/%{name}/misc/rc.config.firebird
 mv -v .%{_sysconfdir}/%{name}/README .%{_sysconfdir}/%{name}/WhatsNew \
   .%{_docdir}/%{name}/
@@ -211,6 +229,12 @@ mv -v .%{_sysconfdir}/%{name}/IPLicense.txt .%{_docdir}/%{name}/
 mv -v .%{_bindir}/gstat .%{_bindir}/gstat-fb
 mv -v .%{_bindir}/isql .%{_bindir}/isql-fb
 
+echo 1 > %{buildroot}%{_localstatedir}/log/%{name}/%{name}.log
+sed "s@%{name}.log@%{_localstatedir}/log/%{name}/%{name}.log@g" %{SOURCE1} > %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
+cp %{SOURCE3} %{buildroot}%{_sysconfdir}/tmpfiles.d/
+
 ls -lR
 
 %clean
@@ -218,13 +242,18 @@ rm -Rf %{buildroot}
 
 
 %files
+%{_docdir}/%{name}/IDPLicense.txt
+%{_docdir}/%{name}/IPLicense.txt
 %{_bindir}/fbtracemgr
 %{_sbindir}/firebird
 %{_sbindir}/fbguard
 %{_sbindir}/fb_lock_print
 %{_libdir}/%{name}/utils
 %dir %{_sysconfdir}/%{name}
-%config(noreplace) %{_sysconfdir}/%{name}/*.conf
+%config(noreplace) %{_sysconfdir}/%{name}/databases.conf
+%config(noreplace) %{_sysconfdir}/%{name}/fbtrace.conf
+%config(noreplace) %{_sysconfdir}/%{name}/firebird.conf
+%config(noreplace) %{_sysconfdir}/%{name}/plugins.conf
 %{_libdir}/libib_util.so
 %dir %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
@@ -233,15 +262,22 @@ rm -Rf %{buildroot}
 %{_datadir}/%{name}/misc
 %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/udf
-%{_docdir}/%{name}/IDPLicense.txt
-%{_docdir}/%{name}/IPLicense.txt
 
 %dir %{_localstatedir}/lib/%{name}
 %dir %{_localstatedir}/lib/%{name}/secdb
+%dir %{_localstatedir}/lib/%{name}/data
+%dir %{_localstatedir}/lib/%{name}/system
 %attr(0600,firebird,firebird) %config(noreplace) %{_localstatedir}/lib/%{name}/secdb/security3.fdb
-%dir %{_libdir}/%{name}/sample
-%attr(0600,firebird,firebird) %{_libdir}/%{name}/sample/*
-%attr(0750,firebird,firebird) %{_localstatedir}/log/%{name}
+%attr(0600,firebird,firebird) %{_localstatedir}/lib/%{name}/system/help.fdb
+%attr(0600,firebird,firebird) %{_localstatedir}/lib/%{name}/system/firebird.msg
+%ghost %dir %attr(0775,%{name},%{name}) %{_var}/run/%{name}
+%ghost %attr(0644,%{name},%{name}) %{_var}/run/%{name}/fb_guard
+%dir %{_sysconfdir}/tmpfiles.d  
+%defattr(0644,root,root)
+%{_sysconfdir}/tmpfiles.d/firebird.conf 
+%dir %{_localstatedir}/log/%{name}
+%config(noreplace) %attr(0664,%{name},%{name})  %{_localstatedir}/log/%{name}/%{name}.log
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/logrotate.d/%{name}
 
 
 %files devel
@@ -282,7 +318,11 @@ rm -Rf %{buildroot}
 %{_bindir}/qli
 %{_bindir}/gsplit
 
+%files examples
+%{_docdir}/%{name}/sample
+%attr(0600,firebird,firebird) %{_localstatedir}/lib/%{name}/data/employee.fdb
+
 %changelog
-* Wed Feb 24 2016 Philippe Makowski <makowski@fedoraproject.org> -
+* Tue Mar 1 2016 Philippe Makowski <makowski@fedoraproject.org> - 3.0.0.32366-1
 -  first version for Epel7