From 74d9903b5710cd1606e2bd920272a4b6c510ed54 Mon Sep 17 00:00:00 2001 From: vincents Date: Sat, 15 Sep 2007 09:15:53 +0000 Subject: [PATCH] fixed x86_64-linux rpms for fpc 2.2.0 git-svn-id: trunk@12033 - --- tools/install/build_fpc_snaphot_rpm.sh | 5 +---- tools/install/create_lazarus_snapshot_rpm.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/install/build_fpc_snaphot_rpm.sh b/tools/install/build_fpc_snaphot_rpm.sh index df7f2762b2..da1c09d415 100755 --- a/tools/install/build_fpc_snaphot_rpm.sh +++ b/tools/install/build_fpc_snaphot_rpm.sh @@ -64,10 +64,7 @@ CompilerVersion=`cat $VersionFile | grep ' *version_nr *=.*;' | sed -e 's/[^0-9] CompilerRelease=`cat $VersionFile | grep ' *release_nr *=.*;' | sed -e 's/[^0-9]//g'` CompilerPatch=`cat $VersionFile | grep ' *patch_nr *=.*;' | sed -e 's/[^0-9]//g'` CompilerVersionStr="$CompilerVersion.$CompilerRelease.$CompilerPatch" -LazVersion="$CompilerVersion.$CompilerRelease" -if [ "$CompilerPatch" != "0" ]; then - LazVersion="$LazVersion.$CompilerPatch" -fi +LazVersion="$CompilerVersion.$CompilerRelease.$CompilerPatch" # set version numbers in all Makefiles perl replace_in_files.pl -sR -f '=\d.\d.\d' -r =$CompilerVersionStr -m 'Makefile(.fpc)?' $TmpDir/* diff --git a/tools/install/create_lazarus_snapshot_rpm.sh b/tools/install/create_lazarus_snapshot_rpm.sh index b32fc9d343..04f038628a 100755 --- a/tools/install/create_lazarus_snapshot_rpm.sh +++ b/tools/install/create_lazarus_snapshot_rpm.sh @@ -30,7 +30,7 @@ Date=`date +%Y%m%d` RPMDIR=$(rpm/get_rpm_source_dir.sh) ARCH=`rpm --eval "%{_arch}"` LIB=`rpm --eval "%{_lib}"` -FPCRPM=$RPMDIR/RPMS/$ARCH/fpc-2.0.4-$Date.$ARCH.rpm +FPCRPM=$RPMDIR/RPMS/$ARCH/fpc-2.2.0-$Date.$ARCH.rpm if [ ! -f $FPCRPM ]; then echo ERROR: fpc rpm $FPCRPM not available exit