diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 28708ddec73..38dad83e70c 100755 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -39,8 +39,9 @@ $FILENAMERPM="$PROJECT-$MAJOR.$MINOR.$BUILD-$RPMSUBVERSION"; $FILENAMEDEB="${PROJECT}_${MAJOR}.${MINOR}.${BUILD}"; $FILENAMEAPS="$PROJECT-$MAJOR.$MINOR.$BUILD.app"; $FILENAMEEXEDOLIWAMP="DoliWamp-$MAJOR.$MINOR.$BUILD"; -if (-d "/usr/src/redhat") { $RPMDIR="/usr/src/redhat"; } # redhat -if (-d "/usr/src/RPM") { $RPMDIR="/usr/src/RPM"; } # mandrake +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 use vars qw/ $REVISION $VERSION /; @@ -450,6 +451,9 @@ if ($nboftargetok) { $FILENAMETGZ2="$PROJECT-$MAJOR.$MINOR.$REL1"; + #print "Create directory $RPMDIR\n"; + #$ret=`mkdir -p "$RPMDIR"`; + print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm...\n"; unlink("$NEWDESTI/".$FILENAMETGZ2."-".$RPMSUBVERSION.".".$ARCH.".rpm"); print "Remove target ".$FILENAMETGZ2."-".$RPMSUBVERSION.".src.rpm...\n"; diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index f21604265a0..f3cdc1d0077 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -108,6 +108,7 @@ cui hai bisogno ed essere facile da usare. %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts # Lang +echo "%defattr(0644, root, root, 0644)" > %{name}.lang for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_* do lang=$(basename $i) @@ -118,7 +119,7 @@ do else echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang" fi -done >%{name}.lang +done >>%{name}.lang #---- clean diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index d788e88b28b..0a0c77bd154 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -165,6 +165,7 @@ cui hai bisogno ed essere facile da usare. %endif # Lang +echo "%defattr(0644, root, root, 0644)" > %{name}.lang for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_* do lang=$(basename $i) @@ -175,7 +176,7 @@ do else echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang" fi -done >%{name}.lang +done >>%{name}.lang %if 0%{?suse_version} # Enable this command to tag desktop file for suse diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 3e54c6641ed..c5b881ac7ea 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -105,6 +105,7 @@ cui hai bisogno ed essere facile da usare. %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts # Lang +echo "%defattr(0644, root, root, 0644)" > %{name}.lang for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_* do lang=$(basename $i) @@ -115,7 +116,7 @@ do else echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang" fi -done >%{name}.lang +done >>%{name}.lang #---- clean diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 5e68e4f1c34..5c282829116 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -104,6 +104,7 @@ cui hai bisogno ed essere facile da usare. %{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/includes/fonts # Lang +echo "%defattr(0644, root, root, 0644)" > %{name}.lang for i in $RPM_BUILD_ROOT%{_datadir}/%{name}/htdocs/langs/*_* do lang=$(basename $i) @@ -114,7 +115,7 @@ do else echo "%lang(${lang}) %{_datadir}/%{name}/htdocs/langs/${lang}/*.lang" fi -done >%{name}.lang +done >>%{name}.lang # Enable this command to tag desktop file for suse #%suse_update_desktop_file dolibarr