- fix path to fbmgr in firebird.init

- make it build (dirty hack applied, dunno if it is propper approach)
- needs tests

Changed files:
    Firebird.spec -> 1.36

diff --git a/Firebird.spec b/Firebird.spec
index 3fa9cc894e7707f11dd09336094673c8fa1a0546..43e3c9f94d5dbedf6a9a6c0bf716405f01cac7f1 100644 (file)
--- a/Firebird.spec
+++ b/Firebird.spec
@@ -174,6 +174,7 @@ DARCH="-Dsparc"
 DARCH=""
 %endif
 %endif
 DARCH=""
 %endif
 %endif

+

 %{__make} -j1 \
        CC="%{__cc}" \
        CXX="%{__cxx}" \
 %{__make} -j1 \
        CC="%{__cc}" \
        CXX="%{__cxx}" \


@@ -182,6 +183,16 @@ DARCH=""
        LIB_LINK_RPATH_LINE= \
        LIB_CLIENT_LINK_OPTIONS="-lpthread"
 
        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...)
 /sbin/fuser -k gen/firebird/bin/fb_lock_mgr 2>/dev/null || :
 
 # fb_lock_mgr is started during build - try to stop it (if /proc is mounted...)
 /sbin/fuser -k gen/firebird/bin/fb_lock_mgr 2>/dev/null || :
 


@@ -195,6 +206,7 @@ install -d $RPM_BUILD_ROOT{%{ibdir},%{_libdir},%{_includedir}} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 install gen/firebird/lib/libfb*.a $RPM_BUILD_ROOT%{_libdir}
        $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 \
 cd gen/buildroot/%{ibdir}
 
 cp -af UDF bin help intl aliases.conf firebird.conf firebird.msg security.fdb \


@@ -212,6 +224,7 @@ ln -sf libfbstatic.a $RPM_BUILD_ROOT%{_libdir}/libgds.a
 install %{SOURCE4}     $RPM_BUILD_ROOT/etc/rc.d/init.d/firebird
 install %{SOURCE5}      $RPM_BUILD_ROOT/etc/sysconfig/firebird
 install %{SOURCE6}     $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird
 install %{SOURCE4}     $RPM_BUILD_ROOT/etc/rc.d/init.d/firebird
 install %{SOURCE5}      $RPM_BUILD_ROOT/etc/sysconfig/firebird
 install %{SOURCE6}     $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/firebird

+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT