Work on 3.1 packaging
This commit is contained in:
parent
5c35651214
commit
8e9f2f99ea
@ -2,7 +2,7 @@
|
|||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
# \file build/makepack-dolibarr.pl
|
# \file build/makepack-dolibarr.pl
|
||||||
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
# \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps)
|
||||||
# \version $Id: makepack-dolibarr.pl,v 1.123 2011/07/30 14:56:12 eldy Exp $
|
# \version $Id: makepack-dolibarr.pl,v 1.124 2011/07/31 13:17:03 eldy Exp $
|
||||||
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
# \author (c)2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
#----------------------------------------------------------------------------
|
#----------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") {
|
|||||||
|
|
||||||
|
|
||||||
use vars qw/ $REVISION $VERSION /;
|
use vars qw/ $REVISION $VERSION /;
|
||||||
$REVISION='$Revision: 1.123 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
$REVISION='$Revision: 1.124 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1;
|
||||||
$VERSION="1.0 (build $REVISION)";
|
$VERSION="1.0 (build $REVISION)";
|
||||||
|
|
||||||
|
|
||||||
@ -696,12 +696,12 @@ if ($nboftargetok) {
|
|||||||
if ($OS =~ /windows/i)
|
if ($OS =~ /windows/i)
|
||||||
{
|
{
|
||||||
print "Move *_all.deb to $DESTI\n";
|
print "Move *_all.deb to $DESTI\n";
|
||||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
print "Move *_all.deb to $DESTI\n";
|
print "Move *_all.deb to $DESTI\n";
|
||||||
$ret=`mv "$BUILDROOT/*_all.deb" "$DESTI/"`;
|
$ret=`mv $BUILDROOT/*_all.deb "$DESTI/"`;
|
||||||
}
|
}
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -20,7 +20,7 @@ Vendor: Dolibarr dev team
|
|||||||
|
|
||||||
URL: http://www.%{name}.org
|
URL: http://www.%{name}.org
|
||||||
Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
|
Source: /usr/src/RPM/SOURCES/%{name}-%{version}.tgz
|
||||||
BuildArch: noarch
|
#BuildArch: noarch
|
||||||
#BuildArchitectures: noarch
|
#BuildArchitectures: noarch
|
||||||
BuildRoot: /tmp/%{name}-buildroot
|
BuildRoot: /tmp/%{name}-buildroot
|
||||||
#Icon: dolibarr_logo1.gif
|
#Icon: dolibarr_logo1.gif
|
||||||
@ -345,19 +345,12 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Removed dirs after apache restart
|
# Removed dirs after apache restart
|
||||||
echo Removed remaining $apacheconfig
|
echo Removed remaining dirs
|
||||||
rm -f $apacheconfig
|
rm -f $apacheconfig
|
||||||
echo Removed remaining $config
|
|
||||||
rm -f $config
|
rm -f $config
|
||||||
echo Removed remaining $installconfig
|
|
||||||
rm -f $installconfig
|
rm -f $installconfig
|
||||||
echo Removed remaining $lockfile
|
|
||||||
rm -f $lockfile
|
rm -f $lockfile
|
||||||
echo Removed remaining dir $targetdir/doc
|
|
||||||
rmdir $targetdir/doc >/dev/null 2>&1
|
rmdir $targetdir/doc >/dev/null 2>&1
|
||||||
#echo Removed remaining dir $targetdir/htdocs
|
rmdir $targetdir/htdocs >/dev/null 2>&1
|
||||||
#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Wed Jul 31 2011 Laurent Destailleur 3.1.0
|
|
||||||
- Initial upstream (#723326)
|
|
||||||
|
|||||||
@ -4,9 +4,9 @@ $force_install_message='KeepDefaultValuesDeb';
|
|||||||
$force_install_main_data_root='/usr/share/dolibarr/documents';
|
$force_install_main_data_root='/usr/share/dolibarr/documents';
|
||||||
$force_install_type='mysqli';
|
$force_install_type='mysqli';
|
||||||
$force_install_port='3306';
|
$force_install_port='3306';
|
||||||
$force_install_database='dolibarr';
|
$force_install_database='dolibarrrpm';
|
||||||
$force_install_createdatabase='1';
|
$force_install_createdatabase='1';
|
||||||
$force_install_databaselogin='dolibarrmysql';
|
$force_install_databaselogin='dolibarrrpm';
|
||||||
$force_install_databasepass='';
|
$force_install_databasepass='';
|
||||||
$force_install_createuser='1';
|
$force_install_createuser='1';
|
||||||
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
$force_install_databaserootlogin='__SUPERUSERLOGIN__';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user