From a7af2b7a69ce4584832cbaea6c82a2441bafeeab Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 17 May 2026 18:10:33 +0200 Subject: [PATCH] Fix packaging --- dev/build/makepack-dolibarr.php | 10 +++++----- dev/build/makepack-dolibarr.pl | 1 + dev/build/rpm/dolibarr_fedora.spec | 4 ++++ dev/build/rpm/dolibarr_generic.spec | 4 ++++ dev/build/rpm/dolibarr_mandriva.spec | 4 ++++ dev/build/rpm/dolibarr_opensuse.spec | 4 ++++ 6 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dev/build/makepack-dolibarr.php b/dev/build/makepack-dolibarr.php index 84357ab9366..d7db40d97ad 100755 --- a/dev/build/makepack-dolibarr.php +++ b/dev/build/makepack-dolibarr.php @@ -105,10 +105,9 @@ $ALTERNATEPATH = [ ]; $RPMSUBVERSION = 'auto'; -$RPMDIR = ''; +$RPMDIR = (getenv('HOME') ?: '') . '/rpmbuild'; // by default if (is_dir('/usr/src/redhat')) { $RPMDIR = '/usr/src/redhat'; } // redhat if (is_dir('/usr/src/packages')) { $RPMDIR = '/usr/src/packages'; } // opensuse -if (is_dir('/usr/src/RPM')) { $RPMDIR = '/usr/src/RPM'; } // mandrake $VERSION = '4.0'; @@ -652,10 +651,10 @@ if ($nboftargetok) { run("rm -f $BUILDROOT/$PROJECT/build.xml"); run("rm -f $BUILDROOT/$PROJECT/.pre-commit-config.yaml"); - run("rm -f $BUILDROOT/$PROJECT/.phan"); + run("rm -fr $BUILDROOT/$PROJECT/.phan"); run("rm -f $BUILDROOT/$PROJECT/phpstan.neon"); - run("rm -f $BUILDROOT/$PROJECT/phpstan.neon.dist"); + run("rm -fr $BUILDROOT/$PROJECT/phpstan.neon.dist"); run("rm -f $BUILDROOT/$PROJECT/pom.xml"); run("rm -f $BUILDROOT/$PROJECT/README-*.md"); @@ -674,7 +673,7 @@ if ($nboftargetok) { run("rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.xz"); run("rm -f $BUILDROOT/$PROJECT/dev/build/dolibarr-*.zip"); run("rm -f $BUILDROOT/$PROJECT/dev/build/doxygen/doxygen_warnings.log"); - run("rm -f $BUILDROOT/$PROJECT/dev/build/phpstan/phpstan"); + run("rm -fr $BUILDROOT/$PROJECT/dev/build/phpstan/phpstan"); run("rm -f $BUILDROOT/$PROJECT/htdocs/cache.manifest"); run("rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php"); run("rm -f $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql"); @@ -974,6 +973,7 @@ if ($nboftargetok) { if ($RPMDIR === '') { $RPMDIR = (getenv('HOME') ?: '') . '/rpmbuild'; } echo "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; + echo "RPMDIR = $RPMDIR\n"; echo "Remove target $FILENAMERPM...\n"; @unlink("$NEWDESTI/$FILENAMERPM"); diff --git a/dev/build/makepack-dolibarr.pl b/dev/build/makepack-dolibarr.pl index 366c29d9eed..fd2957ed9d1 100755 --- a/dev/build/makepack-dolibarr.pl +++ b/dev/build/makepack-dolibarr.pl @@ -1058,6 +1058,7 @@ if ($nboftargetok) { if ( $RPMDIR eq "" ) { $RPMDIR = $ENV{'HOME'} . "/rpmbuild"; } print "Version is $MAJOR.$MINOR.$REL1-$RPMSUBVERSION\n"; + print "RPMDIR = $RPMDIR\n"; print "Remove target " . $FILENAMERPM . "...\n"; unlink( "$NEWDESTI/" . $FILENAMERPM ); diff --git a/dev/build/rpm/dolibarr_fedora.spec b/dev/build/rpm/dolibarr_fedora.spec index e34b610e943..7e5a4cc094c 100644 --- a/dev/build/rpm/dolibarr_fedora.spec +++ b/dev/build/rpm/dolibarr_fedora.spec @@ -133,6 +133,10 @@ done >>%{name}.lang #---- files %files -f %{name}.lang +%_datadir/dolibarr/htdocs/langs/zh_CN/README.md +%_datadir/dolibarr/htdocs/langs/zh_HK/README.md +%_datadir/dolibarr/htdocs/langs/zh_TW/README.md + %defattr(0755, root, root, 0755) %dir %_datadir/dolibarr diff --git a/dev/build/rpm/dolibarr_generic.spec b/dev/build/rpm/dolibarr_generic.spec index 733215753b7..997ba88a9d9 100644 --- a/dev/build/rpm/dolibarr_generic.spec +++ b/dev/build/rpm/dolibarr_generic.spec @@ -214,6 +214,10 @@ done >>%{name}.lang #---- files %files -f %{name}.lang +%_datadir/dolibarr/htdocs/langs/zh_CN/README.md +%_datadir/dolibarr/htdocs/langs/zh_HK/README.md +%_datadir/dolibarr/htdocs/langs/zh_TW/README.md + %defattr(0755, root, root, 0755) %dir %_datadir/dolibarr diff --git a/dev/build/rpm/dolibarr_mandriva.spec b/dev/build/rpm/dolibarr_mandriva.spec index c89b483f63d..3294bb5ddb5 100644 --- a/dev/build/rpm/dolibarr_mandriva.spec +++ b/dev/build/rpm/dolibarr_mandriva.spec @@ -131,6 +131,10 @@ done >>%{name}.lang #---- files %files -f %{name}.lang +%_datadir/dolibarr/htdocs/langs/zh_CN/README.md +%_datadir/dolibarr/htdocs/langs/zh_HK/README.md +%_datadir/dolibarr/htdocs/langs/zh_TW/README.md + %defattr(0755, root, root, 0755) %dir %_datadir/dolibarr diff --git a/dev/build/rpm/dolibarr_opensuse.spec b/dev/build/rpm/dolibarr_opensuse.spec index ebf556707de..ad863074db1 100644 --- a/dev/build/rpm/dolibarr_opensuse.spec +++ b/dev/build/rpm/dolibarr_opensuse.spec @@ -141,6 +141,10 @@ done >>%{name}.lang #---- files %files -f %{name}.lang +%_datadir/dolibarr/htdocs/langs/zh_CN/README.md +%_datadir/dolibarr/htdocs/langs/zh_HK/README.md +%_datadir/dolibarr/htdocs/langs/zh_TW/README.md + %defattr(0755, root, root, 0755) %dir %_datadir/dolibarr