8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00

Fixed CORE-1421: RPM libstdc++ version dependency

This commit is contained in:
alexpeshkoff 2008-01-09 15:47:45 +00:00
parent 24c4ae4a20
commit ba5b321861
3 changed files with 11 additions and 4 deletions

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in,v 1.6 2005-05-27 22:15:05 asfernandes Exp $
# $Id: Makefile.in,v 1.7 2008-01-09 15:47:36 alexpeshkoff Exp $
#
ROOT=..
@ -103,6 +103,10 @@ RPMSrcDir=$(GEN_ROOT)/install/scripts
TarInstallDir=$(GEN_ROOT)/install
#Target for required libraries detection
RpmRequiredVersionTarget=$(GEN_ROOT)/firebird/bin/isql
#Curses library
TermLib=@TERMLIB@.so
dist : packages
@ -195,7 +199,10 @@ $(RPMFile) : $(GEN_ROOT)/install/rpmscript buildImageDir
$(GEN_ROOT)/install/rpmscript :
echo $@
cat $(RPMSrcDir)/rpmheader.txt > $@
awk < $(RPMSrcDir)/rpmheader.txt 'BEGIN {fl=1;} ($$1 == "Requires:") {fl=0;} (fl) {print $$0;}' > $@
echo -n "Requires: `ldd $(RpmRequiredVersionTarget) | grep $(TermLib) | awk '{print $$1;}'`" >> $@
echo ", `ldd $(RpmRequiredVersionTarget) | grep libstdc++ | awk '{print $$1;}'`" >> $@
awk < $(RPMSrcDir)/rpmheader.txt 'BEGIN {fl=0;} (fl) {print $$0;} ($$1 == "Requires:") {fl=1;}' >> $@
echo "" >> $@
echo "%prep" >> $@
# cat $(ClassicSrcDir)/prepinstall.sh >> $@

View File

@ -11,7 +11,7 @@ AutoReqProv: no
# BuildArchitectures: @CPU_TYPE@
# BuildRoot: /var/tmp/%{name}-buildroot
BuildRoot: @BUILD_ROOT_DIR@/gen/buildroot
Requires: libncurses.so.5 libstdc++.so.5
Requires: ### will be set in Makefile to current libncurses and libstdc ###
Provides: Firebird libfbclient.so.2@RPM64@ libfbembed.so.2@RPM64@ libgds.so
%description

View File

@ -10,7 +10,7 @@ URL: http://firebird.sourceforge.net
AutoReqProv: no
# BuildArchitectures: @CPU_TYPE@
BuildRoot: @BUILD_ROOT_DIR@/gen/buildroot
Requires: libncurses.so.5 libstdc++.so.5
Requires: ### will be set in Makefile to current libncurses and libstdc ###
Provides: Firebird libfbclient.so.2@RPM64@ libgds.so
%description