From 82af80d4112866d0e55f02f06dbeb6f058a8cc4d Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 25 Feb 2026 19:07:24 +0100 Subject: [PATCH] Prepare 23.0.0 --- dev/build/makepack-dolibarr.pl | 16 +++++++++++++--- dev/build/rpm/dolibarr-forrpm.patch | 4 ++-- dev/build/rpm/dolibarr_fedora.spec | 1 - dev/build/rpm/dolibarr_generic.spec | 1 - dev/build/rpm/dolibarr_mandriva.spec | 1 - dev/build/rpm/dolibarr_opensuse.spec | 1 - htdocs/filefunc.inc.php | 5 +++-- htdocs/version.inc.php | 2 ++ 8 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dev/build/makepack-dolibarr.pl b/dev/build/makepack-dolibarr.pl index 5d794d295db..059ed4b65ae 100755 --- a/dev/build/makepack-dolibarr.pl +++ b/dev/build/makepack-dolibarr.pl @@ -60,9 +60,19 @@ my %ALTERNATEPATH = ( ); my $RPMSUBVERSION = "auto"; # auto use value found into BUILD +my $RPMDIR = "$ENV{HOME}/rpmbuild"; # by default if ( -d "/usr/src/redhat" ) { $RPMDIR = "/usr/src/redhat"; } # redhat if ( -d "/usr/src/packages" ) { $RPMDIR = "/usr/src/packages"; } # opensuse -if ( -d "/usr/src/RPM" ) { $RPMDIR = "/usr/src/RPM"; } # mandrake + +if ( ! -d "$RPMDIR/SOURCES" ) { + mkdir("$RPMDIR/SOURCES"); + if ( ! -d "$RPMDIR/SOURCES" ) { + print "Failed to create dir $RPMDIR/SOURCES\n"; + sleep 2; + exit 1; + } +} + use vars qw/ $REVISION $VERSION /; my $VERSION = "4.0"; @@ -203,10 +213,10 @@ while (<$IN>) { } } close $IN; -open( my $IN2, "<", $SOURCE . "/htdocs/filefunc.inc.php" ) +open( my $IN2, "<", $SOURCE . "/htdocs/version.inc.php" ) or die "Error: Can't open version file " . $SOURCE - . "/htdocs/filefunc.inc.php\n"; + . "/htdocs/version.inc.php\n"; while (<$IN2>) { if ( $_ =~ /define\('DOL_MINOR_VERSION',\s*'([\d\.a-z\-]+)'\)/ ) { $MINORVERSION = $1; diff --git a/dev/build/rpm/dolibarr-forrpm.patch b/dev/build/rpm/dolibarr-forrpm.patch index 5ef30d39025..a1d216aa44b 100644 --- a/dev/build/rpm/dolibarr-forrpm.patch +++ b/dev/build/rpm/dolibarr-forrpm.patch @@ -1,9 +1,9 @@ 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 2011-09-03 02:33:00.510952001 +0200 -@@ -63,8 +63,8 @@ +@@ -128,8 +128,8 @@ $conffile = "conf/conf.php"; - $conffiletoshow = "htdocs/conf/conf.php"; + $conffiletoshow = "htdocs/conf/conf.php"; // Used into the include // For debian/redhat like systems -//$conffile = "/etc/dolibarr/conf.php"; -//$conffiletoshow = "/etc/dolibarr/conf.php"; diff --git a/dev/build/rpm/dolibarr_fedora.spec b/dev/build/rpm/dolibarr_fedora.spec index c1a89be6e02..e34b610e943 100644 --- a/dev/build/rpm/dolibarr_fedora.spec +++ b/dev/build/rpm/dolibarr_fedora.spec @@ -189,7 +189,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport %_datadir/dolibarr/htdocs/exports -%_datadir/dolibarr/htdocs/externalsite %_datadir/dolibarr/htdocs/fichinter %_datadir/dolibarr/htdocs/fourn %_datadir/dolibarr/htdocs/ftp diff --git a/dev/build/rpm/dolibarr_generic.spec b/dev/build/rpm/dolibarr_generic.spec index 6bf9c3f9d02..733215753b7 100644 --- a/dev/build/rpm/dolibarr_generic.spec +++ b/dev/build/rpm/dolibarr_generic.spec @@ -270,7 +270,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport %_datadir/dolibarr/htdocs/exports -%_datadir/dolibarr/htdocs/externalsite %_datadir/dolibarr/htdocs/fichinter %_datadir/dolibarr/htdocs/fourn %_datadir/dolibarr/htdocs/ftp diff --git a/dev/build/rpm/dolibarr_mandriva.spec b/dev/build/rpm/dolibarr_mandriva.spec index 94675455d3f..c89b483f63d 100644 --- a/dev/build/rpm/dolibarr_mandriva.spec +++ b/dev/build/rpm/dolibarr_mandriva.spec @@ -187,7 +187,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport %_datadir/dolibarr/htdocs/exports -%_datadir/dolibarr/htdocs/externalsite %_datadir/dolibarr/htdocs/fichinter %_datadir/dolibarr/htdocs/fourn %_datadir/dolibarr/htdocs/ftp diff --git a/dev/build/rpm/dolibarr_opensuse.spec b/dev/build/rpm/dolibarr_opensuse.spec index c9fe4e6e59f..ebf556707de 100644 --- a/dev/build/rpm/dolibarr_opensuse.spec +++ b/dev/build/rpm/dolibarr_opensuse.spec @@ -197,7 +197,6 @@ done >>%{name}.lang %_datadir/dolibarr/htdocs/expedition %_datadir/dolibarr/htdocs/expensereport %_datadir/dolibarr/htdocs/exports -%_datadir/dolibarr/htdocs/externalsite %_datadir/dolibarr/htdocs/fichinter %_datadir/dolibarr/htdocs/fourn %_datadir/dolibarr/htdocs/ftp diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php index ff9831cfec0..2cd5f90d535 100644 --- a/htdocs/filefunc.inc.php +++ b/htdocs/filefunc.inc.php @@ -33,11 +33,12 @@ */ -define('DOL_MINOR_VERSION', '0.0'); - if (!defined('DOL_APPLICATION_TITLE')) { define('DOL_APPLICATION_TITLE', 'Dolibarr'); } +if (!defined('DOL_VERSION')) { + define('DOL_VERSION', '23.0.0'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c +} require_once 'version.inc.php'; // Define the DOL_VERSION diff --git a/htdocs/version.inc.php b/htdocs/version.inc.php index 78284cce9ab..6dde63e3a4a 100644 --- a/htdocs/version.inc.php +++ b/htdocs/version.inc.php @@ -38,6 +38,8 @@ if (!defined('DOL_APPLICATION_TITLE')) { // The major version of Dolibarr define('DOL_MAJOR_VERSION', '23'); +define('DOL_MINOR_VERSION', '0.0'); + define('DOL_VERSION', constant('DOL_MAJOR_VERSION').'.'.constant('DOL_MINOR_VERSION')); // DOL_VERSION is now a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c