Update packager
This commit is contained in:
parent
2020d6ae00
commit
82744c0020
File diff suppressed because it is too large
Load Diff
@ -504,7 +504,7 @@ if ($nboftargetok) {
|
|||||||
print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
|
print "Launch RPM build (rpmbuild --clean -ba $BUILDROOT/${BUILDFIC})\n";
|
||||||
#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
|
#$ret=`rpmbuild -vvvv --clean -ba $BUILDROOT/${BUILDFIC}`;
|
||||||
$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
|
$ret=`rpmbuild --clean -ba $BUILDROOT/${BUILDFIC}`;
|
||||||
|
|
||||||
# Move to final dir
|
# Move to final dir
|
||||||
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
|
print "Move $RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm into $NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION."*.".$ARCH.".rpm\n";
|
||||||
#$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
|
#$cmd="mv \"$RPMDIR/RPMS/".$ARCH."/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\" \"$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm\"";
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
|
diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
|
||||||
--- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200
|
--- htdocs/filefunc.inc.php.patch 2011-09-03 02:32:48.666952000 +0200
|
||||||
+++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200
|
+++ htdocs/filefunc.inc.php 2011-09-03 02:33:00.510952001 +0200
|
||||||
@@ -64,8 +64,8 @@
|
@@ -63,8 +63,8 @@
|
||||||
$conffile = "conf/conf.php";
|
$conffile = "conf/conf.php";
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
// For debian/redhat like systems
|
// For debian/redhat like systems
|
||||||
@ -15,7 +15,7 @@ diff -up htdocs/filefunc.inc.php.patch htdocs/filefunc.inc.php
|
|||||||
diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
|
diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
|
||||||
--- htdocs/install/inc.php.patch 2011-09-03 02:33:26.450952000 +0200
|
--- htdocs/install/inc.php.patch 2011-09-03 02:33:26.450952000 +0200
|
||||||
+++ htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200
|
+++ htdocs/install/inc.php 2011-09-03 02:33:36.286952001 +0200
|
||||||
@@ -84,8 +84,8 @@
|
@@ -70,8 +70,8 @@
|
||||||
$conffile = "../conf/conf.php";
|
$conffile = "../conf/conf.php";
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
// For debian/redhat like systems
|
// For debian/redhat like systems
|
||||||
@ -29,7 +29,7 @@ diff -up htdocs/install/inc.php.patch htdocs/install/inc.php
|
|||||||
diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
|
diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
|
||||||
--- htdocs/support/inc.php.patch 2011-09-03 02:34:39.606952000 +0200
|
--- htdocs/support/inc.php.patch 2011-09-03 02:34:39.606952000 +0200
|
||||||
+++ htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200
|
+++ htdocs/support/inc.php 2011-09-03 02:33:59.814952000 +0200
|
||||||
@@ -79,8 +79,8 @@
|
@@ -69,8 +69,8 @@
|
||||||
$conffile = "../conf/conf.php";
|
$conffile = "../conf/conf.php";
|
||||||
$conffiletoshow = "htdocs/conf/conf.php";
|
$conffiletoshow = "htdocs/conf/conf.php";
|
||||||
// For debian/redhat like systems
|
// For debian/redhat like systems
|
||||||
@ -38,5 +38,5 @@ diff -up htdocs/support/inc.php.patch htdocs/support/inc.php
|
|||||||
+$conffile = "/etc/dolibarr/conf.php";
|
+$conffile = "/etc/dolibarr/conf.php";
|
||||||
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
+$conffiletoshow = "/etc/dolibarr/conf.php";
|
||||||
|
|
||||||
$charset="UTF-8"; // If not output format found in any conf file
|
|
||||||
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
if (! defined('DONOTLOADCONF') && file_exists($conffile))
|
||||||
|
{
|
||||||
|
|||||||
@ -157,6 +157,7 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
%_datadir/dolibarr/htdocs/commande
|
%_datadir/dolibarr/htdocs/commande
|
||||||
|
%_datadir/dolibarr/htdocs/commissions
|
||||||
%_datadir/dolibarr/htdocs/compta
|
%_datadir/dolibarr/htdocs/compta
|
||||||
%_datadir/dolibarr/htdocs/conf
|
%_datadir/dolibarr/htdocs/conf
|
||||||
%_datadir/dolibarr/htdocs/contact
|
%_datadir/dolibarr/htdocs/contact
|
||||||
@ -175,6 +176,8 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/install
|
%_datadir/dolibarr/htdocs/install
|
||||||
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
||||||
%_datadir/dolibarr/htdocs/livraison
|
%_datadir/dolibarr/htdocs/livraison
|
||||||
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
|
%_datadir/dolibarr/htdocs/margin
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
%_datadir/dolibarr/htdocs/product
|
%_datadir/dolibarr/htdocs/product
|
||||||
|
|||||||
@ -153,6 +153,7 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
%_datadir/dolibarr/htdocs/commande
|
%_datadir/dolibarr/htdocs/commande
|
||||||
|
%_datadir/dolibarr/htdocs/commissions
|
||||||
%_datadir/dolibarr/htdocs/compta
|
%_datadir/dolibarr/htdocs/compta
|
||||||
%_datadir/dolibarr/htdocs/conf
|
%_datadir/dolibarr/htdocs/conf
|
||||||
%_datadir/dolibarr/htdocs/contact
|
%_datadir/dolibarr/htdocs/contact
|
||||||
@ -171,6 +172,8 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/install
|
%_datadir/dolibarr/htdocs/install
|
||||||
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
||||||
%_datadir/dolibarr/htdocs/livraison
|
%_datadir/dolibarr/htdocs/livraison
|
||||||
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
|
%_datadir/dolibarr/htdocs/margin
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
%_datadir/dolibarr/htdocs/product
|
%_datadir/dolibarr/htdocs/product
|
||||||
|
|||||||
@ -154,6 +154,7 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
%_datadir/dolibarr/htdocs/commande
|
%_datadir/dolibarr/htdocs/commande
|
||||||
|
%_datadir/dolibarr/htdocs/commissions
|
||||||
%_datadir/dolibarr/htdocs/compta
|
%_datadir/dolibarr/htdocs/compta
|
||||||
%_datadir/dolibarr/htdocs/conf
|
%_datadir/dolibarr/htdocs/conf
|
||||||
%_datadir/dolibarr/htdocs/contact
|
%_datadir/dolibarr/htdocs/contact
|
||||||
@ -172,6 +173,8 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/install
|
%_datadir/dolibarr/htdocs/install
|
||||||
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
||||||
%_datadir/dolibarr/htdocs/livraison
|
%_datadir/dolibarr/htdocs/livraison
|
||||||
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
|
%_datadir/dolibarr/htdocs/margin
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
%_datadir/dolibarr/htdocs/product
|
%_datadir/dolibarr/htdocs/product
|
||||||
|
|||||||
@ -159,6 +159,7 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/categories
|
%_datadir/dolibarr/htdocs/categories
|
||||||
%_datadir/dolibarr/htdocs/comm
|
%_datadir/dolibarr/htdocs/comm
|
||||||
%_datadir/dolibarr/htdocs/commande
|
%_datadir/dolibarr/htdocs/commande
|
||||||
|
%_datadir/dolibarr/htdocs/commissions
|
||||||
%_datadir/dolibarr/htdocs/compta
|
%_datadir/dolibarr/htdocs/compta
|
||||||
%_datadir/dolibarr/htdocs/conf
|
%_datadir/dolibarr/htdocs/conf
|
||||||
%_datadir/dolibarr/htdocs/contact
|
%_datadir/dolibarr/htdocs/contact
|
||||||
@ -177,6 +178,8 @@ done >%{name}.lang
|
|||||||
%_datadir/dolibarr/htdocs/install
|
%_datadir/dolibarr/htdocs/install
|
||||||
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
%_datadir/dolibarr/htdocs/langs/HOWTO-Translation.txt
|
||||||
%_datadir/dolibarr/htdocs/livraison
|
%_datadir/dolibarr/htdocs/livraison
|
||||||
|
%_datadir/dolibarr/htdocs/mailmanspip
|
||||||
|
%_datadir/dolibarr/htdocs/margin
|
||||||
%_datadir/dolibarr/htdocs/paybox
|
%_datadir/dolibarr/htdocs/paybox
|
||||||
%_datadir/dolibarr/htdocs/paypal
|
%_datadir/dolibarr/htdocs/paypal
|
||||||
%_datadir/dolibarr/htdocs/product
|
%_datadir/dolibarr/htdocs/product
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user