SPECS: Firebird.spec - fix path to fbmgr in firebird.init - make i...

[adamg]

Author: adamg                        Date: Sun Apr 30 18:54:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix path to fbmgr in firebird.init
- make it build (dirty hack applied, dunno if it is propper approach)
- needs tests

---- Files affected:
SPECS:
   Firebird.spec (1.35 -> 1.36) 

---- Diffs:

================================================================
Index: SPECS/Firebird.spec
diff -u SPECS/Firebird.spec:1.35 SPECS/Firebird.spec:1.36
--- SPECS/Firebird.spec:1.35	Sun Apr 16 23:44:56 2006
+++ SPECS/Firebird.spec	Sun Apr 30 20:54:39 2006
@@ -175,6 +175,7 @@
 DARCH=""
 %endif
 %endif
+
 %{__make} -j1 \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
@@ -183,6 +184,16 @@
 	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 || :
 
@@ -196,6 +207,7 @@
 	$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 \
@@ -213,6 +225,7 @@
 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
 
@@ -297,6 +310,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2006/04/30 18:54:39  adamg
+- fix path to fbmgr in firebird.init
+- make it build (dirty hack applied, dunno if it is propper approach)
+- needs tests
+
 Revision 1.35  2006/04/16 21:44:56  glen
 - fix chkconfig, rc-scripts deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/Firebird.spec?r1=1.35&r2=1.36&f=u