From 3c2ae5c57875c2191644ccd9d86209412558b4a7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 19 Feb 2005 20:31:30 +0000 Subject: [PATCH] Modif make-pack pour ne plus avoir de version en dur dans le fichier spec rpm. --- build/makepack-dolibarr.pl | 13 +++++++++++-- build/rpm/dolibarr.spec | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index e400c31611a..9cd1be5b33e 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -95,7 +95,8 @@ my $copyalreadydone=0; my $batch=0; print "Makepack version $VERSION\n"; -print "Building package for $PROJECT $MAJOR.$MINOR.$BUILD\n"; +print "Building package name: $PROJECT\n"; +print "Building package version: $MAJOR.$MINOR.$BUILD\n"; for (0..@ARGV-1) { if ($ARGV[$_] =~ /^-*target=(\w+)/i) { $target=$1; $batch=1; } @@ -253,7 +254,15 @@ if ($nboftargetok) { $ret=`$cmd`; print "Copy $SOURCE/build/rpm/${BUILDFIC} to $BUILDROOT\n"; - $ret=`cp -p "$SOURCE/build/rpm/${BUILDFIC}" "$BUILDROOT"`; +# $ret=`cp -p "$SOURCE/build/rpm/${BUILDFIC}" "$BUILDROOT"`; + open (SPECFROM,"<$SOURCE/build/rpm/${BUILDFIC}") || die "Error"; + open (SPECTO,">$BUILDROOT/$BUILDFIC") || die "Error"; + while () { + $_ =~ s/__VERSION__/$MAJOR.$MINOR.$BUILD/; + print SPECTO $_; + } + close SPECFROM; + close SPECTO; print "Launch RPM build (rpm --clean -ba $BUILDROOT/${BUILDFIC})\n"; $ret=`rpm --clean -ba $BUILDROOT/${BUILDFIC}`; diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index f47070099e3..790470334bf 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -1,5 +1,5 @@ %define name dolibarr -%define version 2.0.0 +%define version __VERSION__ # For Mandrake #%define release 1mdk # For all other distrib