Fix packaging

This commit is contained in:
Laurent Destailleur 2026-05-17 18:10:33 +02:00
parent 8172b31c56
commit a7af2b7a69
6 changed files with 22 additions and 5 deletions

View file

@ -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");

View file

@ -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 );

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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