add fb_config

2 files changed, 91 insertions, 16 deletions

diff --git a/fb_config b/fb_config
new file mode 100644
index 0000000..6d5daef
--- /dev/null
+++ b/fb_config
@@ -0,0 +1,18 @@
+ARCH=$(uname -m)
+
+case $ARCH in
+    x86_64 | sparc64 | s390x | ppc64 | aarch64)
+        LIB_DIR=/usr/lib64
+        SECONDARY_LIB_DIR=/usr/lib
+        ;;
+    *)
+        LIB_DIR=/usr/lib
+        SECONDARY_LIB_DIR=/usr/lib64
+        ;;
+esac
+
+if [ ! -x $LIB_DIR/fb_config ]; then
+    LIB_DIR=$SECONDARY_LIB_DIR
+fi
+
+exec $LIB_DIR/fb_config "$@"
diff --git a/firebird.spec b/firebird.spec
index 477b371..25a5a13 100644
--- a/firebird.spec
+++ b/firebird.spec
@@ -5,7 +5,7 @@
 Summary: SQL relational database management system
 Name:  firebird
 Version: 3.0
-Release:        1.20160228git92718125%{?dist}
+Release:        0%{?dist}
 
 Group:  Applications/Databases
 License: Interbase
@@ -13,6 +13,11 @@ URL:  http://www.firebirdsql.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
 
 Source0:        firebird-92718125.tar.gz
+Source1:  firebird-logrotate
+Source2:  README.Fedora
+Source3:  firebird.conf
+Source4:  fb_config
+
 # from OpenSuse
 Patch101: allow-creating-buildRoot-as-non-root-user.patch
 Patch102: add-pkgconfig-files.patch
@@ -49,6 +54,8 @@ Requires(pre):  /usr/sbin/groupadd
 Requires(pre):  /usr/sbin/useradd
 Requires:  libfbclient2
 Requires:  logrotate
+Requires:  libib-util
+Requires:  %{name}-utils = %{version}
 
 %description
 Firebird is a relational database offering many ANSI SQL standard
@@ -72,6 +79,20 @@ 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 -n libib-util
+Group: System Environment/Libraries
+Summary: Firebird SQL UDF support library
+
+%description -n libib-util
+libib_util contains utility functions used by
+User-Defined Functions (UDF) for memory management etc.
+
+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.
+
 %package -n libfbclient2
 Group: System Environment/Libraries
 Summary: Firebird SQL server client library
@@ -115,6 +136,20 @@ 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 utils
+Group: Applications/Databases
+Requires: libfbclient2 = %{version}
+Summary: Firebird SQL user utilities
+
+%description utils
+Firebird SQL user utilities.
+
+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}
 %patch101 -p1
@@ -130,21 +165,21 @@ in production systems, under a variety of names, since 1981.
 NOCONFIGURE=1 ./autogen.sh
 %configure --prefix=%{_prefix} \
   --disable-binreloc \
-  --with-system-icu --with-system-editline \
+  --with-system-editline \
   --with-fbbin=%{_bindir} --with-fbsbin=%{_sbindir} \
   --with-fbconf=%{_sysconfdir}/%{name} \
   --with-fblib=%{_libdir} --with-fbinclude=%{_includedir}/%{name} \
-  --with-fbdoc=%{_docdir}/%{name} \
+  --with-fbdoc=%{_defaultdocdir}/%{name} \
   --with-fbudf=%{_libdir}/%{name}/udf \
-  --with-fbsample=%{_docdir}/%{name}/sample \
-  --with-fbsample-db=%{_libdir}/%{name}/sample \
-  --with-fbhelp=%{_libdir}/%{name}/lib \
+  --with-fbsample=%{_defaultdocdir}/%{name}/sample \
+  --with-fbsample-db=%{_localstatedir}/lib/%{name}/data/ \
+  --with-fbhelp=%{_localstatedir}/lib/%{name}/system/ \
   --with-fbintl=%{_libdir}/%{name}/intl \
   --with-fbmisc=%{_datadir}/%{name}/misc \
-  --with-fbsecure-db=%{_localstatedir}/lib/%{name}/secdb \
-  --with-fbmsg=%{_libdir}/%{name}/lib \
+  --with-fbsecure-db=%{_localstatedir}/lib/%{name}/system/ \
+  --with-fbmsg=%{_localstatedir}/lib/%{name}/system/ \
   --with-fblog=%{_localstatedir}/log/%{name} \
-  --with-fbglock=%{_localstatedir}/run/%{name} \
+  --with-fbglock=%{_var}/run/%{name} \
   --with-fbplugins=%{_libdir}/%{name}/plugins
 
 make %{?_smp_mflags}
@@ -157,10 +192,12 @@ chmod u+rw,a+rx gen/buildroot/usr/include/firebird/firebird/impl
 cp -r gen/buildroot/* ${RPM_BUILD_ROOT}/
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
 cp -v gen/install/misc/*.pc ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig/
+
 cd ${RPM_BUILD_ROOT}
 mkdir -p .%{_libdir}/%{name}/utils
 mv -v .%{_sbindir}/*.sh .%{_libdir}/%{name}/utils/
-mv -v .%{_sbindir}/fb_config .%{_libdir}/%{name}/utils/
+mv -v .%{_sbindir}/fb_config .%{_libdir}/
+install -p -m 0755 %{SOURCE4} %{buildroot}%{_sbindir}/fb_config
 rm -vf .%{_includedir}/%{name}/perf.h
 rm -vf .%{_libdir}/libicu*.so
 rm -vf .%{_includedir}/*.h
@@ -171,14 +208,20 @@ mv -v .%{_sysconfdir}/%{name}/README .%{_sysconfdir}/%{name}/WhatsNew \
   .%{_docdir}/%{name}/
 mv -v .%{_sysconfdir}/%{name}/IDPLicense.txt .%{_docdir}/%{name}/
 mv -v .%{_sysconfdir}/%{name}/IPLicense.txt .%{_docdir}/%{name}/
+mv -v .%{_bindir}/gstat .%{_bindir}/gstat-fb
+mv -v .%{_bindir}/isql .%{_bindir}/isql-fb
+
+ls -lR
 
 %clean
 rm -Rf %{buildroot}
 
 
 %files
-%{_bindir}/*
-%{_sbindir}/*
+%{_bindir}/fbtracemgr
+%{_sbindir}/firebird
+%{_sbindir}/fbguard
+%{_sbindir}/fb_lock_print
 %{_libdir}/%{name}/utils
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/*.conf
@@ -190,7 +233,6 @@ rm -Rf %{buildroot}
 %{_datadir}/%{name}/misc
 %{_libdir}/%{name}/plugins
 %{_libdir}/%{name}/udf
-%attr(755,root,root) /etc/init.d/firebird
 %{_docdir}/%{name}/IDPLicense.txt
 %{_docdir}/%{name}/IPLicense.txt
 
@@ -205,6 +247,8 @@ rm -Rf %{buildroot}
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}
+%{_libdir}/fb_config
+%{_sbindir}/fb_config
 
 %files -n libfbclient2
 %defattr(-,root,root)
@@ -215,17 +259,30 @@ rm -Rf %{buildroot}
 %{_libdir}/libfbclient.so
 %{_libdir}/pkgconfig/fbclient.pc
 
+%files -n libib-util
+%defattr(-,root,root)
+%{_libdir}/libib_util.so
+
 %files doc
 %{_docdir}/%{name}
 %exclude %{_docdir}/%{name}/sample
 %exclude %{_docdir}/%{name}/IDPLicense.txt
 %exclude %{_docdir}/%{name}/IPLicense.txt
 
+%files utils
+%defattr(-,root,root)
+%{_bindir}/gstat-fb
+%{_bindir}/fbsvcmgr
+%{_bindir}/gbak
+%{_bindir}/gfix
+%{_bindir}/gpre
+%{_bindir}/gsec
+%{_bindir}/isql-fb
+%{_bindir}/nbackup
+%{_bindir}/qli
+%{_bindir}/gsplit
 
 %changelog
-* Sun Feb 28 2016 Philippe Makowski <makowski@fedoraproject.org> - 3.0-1.20160228git92718125
-- Update to git: 92718125
-
 * Wed Feb 24 2016 Philippe Makowski <makowski@fedoraproject.org> -
 -  first version for Epel7