From ee916e527513b99e761d9279720a9fcce4673839 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 15 Aug 2011 17:49:27 +0000 Subject: [PATCH] Work on rpm packages --- build/makepack-dolibarr.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 72822f7f2a2..a1d39a9e97f 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.148 2011/08/15 00:15:18 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.149 2011/08/15 17:49:27 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -45,7 +45,7 @@ if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.148 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.149 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="3.2 (build $REVISION)"; @@ -315,7 +315,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Tymes*.ttf`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/fonts/Veranda*.ttf`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/fckeditor`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/LICENSE.txt`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`;