diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 337b92d8049..e8e37a65d7a 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -1,6 +1,7 @@ [Desktop Entry] -# This file is used to add Ubuntu menu entry +# This file is used to add menu entry # It must be saved into directory /usr/share/applications +Type=2 Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM @@ -17,6 +18,7 @@ Comment[it]=Programma gestionale open source e gratuito per piccole e medie impr # For Debian/Ubuntu: xdg-open or x-www-browser # (exo-open for xfde, gnome-open for gnome, ...) Exec=xdg-open http://localhost/dolibarr +URL=http://localhost/dolibarr Icon=dolibarr Terminal=false Type=Application diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index c7d80b32f12..84c179bb7a0 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -22,11 +22,11 @@ URL: http://www.dolibarr.org Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz Patch0: %{name}-forrpm.patch BuildArch: noarch -#BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Productivity Requires: mysql-server mysql httpd php php-cli php-gd php-ldap php-imap php-mysql dejavu-sans-fonts +#BuildRequires: desktop-file-utils # Set yes to build test package, no for release (this disable need of /usr/bin/php not found by OpenSuse) AutoReqProv: no @@ -91,20 +91,20 @@ cui hai bisogno ed essere facile da usare. %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -#desktop-file-install -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +#desktop-file-install --delete-original --dir=$RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop build/rpm/dolibarr.desktop %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/htdocs %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/scripts -%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr +#%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/doc/dolibarr %{__cp} -pr build/rpm/* $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm %{__cp} -pr build/tgz/* $RPM_BUILD_ROOT/usr/share/dolibarr/build/tgz %{__cp} -pr htdocs $RPM_BUILD_ROOT/usr/share/dolibarr %{__cp} -pr scripts $RPM_BUILD_ROOT/usr/share/dolibarr -%{__cp} -pr doc/* $RPM_BUILD_ROOT/usr/share/doc/dolibarr -%{__install} -m 644 COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT +#%{__cp} -pr doc/* $RPM_BUILD_ROOT/usr/share/doc/dolibarr +#%{__install} -m 644 COPYRIGHT $RPM_BUILD_ROOT/usr/share/doc/dolibarr/COPYRIGHT #---- clean @@ -121,7 +121,7 @@ cui hai bisogno ed essere facile da usare. %_datadir/dolibarr/scripts/* %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr +#%doc %_datadir/doc/dolibarr %dir %_datadir/dolibarr/build/rpm %dir %_datadir/dolibarr/build/tgz %dir %_datadir/dolibarr/htdocs diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index 9e82c9f8611..4d592d4859d 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -22,7 +22,6 @@ URL: http://www.dolibarr.org Source0: http://www.dolibarr.org/files/fedora/%{name}-%{version}.tgz Patch0: %{name}-forrpm.patch BuildArch: noarch -#BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Productivity @@ -91,7 +90,7 @@ cui hai bisogno ed essere facile da usare. %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -#desktop-file-install -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +#desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop build/rpm/dolibarr.desktop %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 937a0c85116..cf390e783b2 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -22,7 +22,6 @@ URL: http://www.dolibarr.org Source0: http://www.dolibarr.org/files/mandriva/%{name}-%{version}.tgz Patch0: %{name}-forrpm.patch BuildArch: noarch -#BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Applications/Productivity @@ -91,7 +90,7 @@ cui hai bisogno ed essere facile da usare. %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -#desktop-file-install -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +#desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop build/rpm/dolibarr.desktop %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 90edf95845c..71e8d20437e 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -22,7 +22,6 @@ URL: http://www.dolibarr.org Source0: http://www.dolibarr.org/files/opensuse/%{name}-%{version}.tgz Patch0: %{name}-forrpm.patch BuildArch: noarch -#BuildArchitectures: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: Productivity/Office/Management @@ -89,7 +88,7 @@ cui hai bisogno ed essere facile da usare. %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps %{__install} -m 644 doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png %{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications -#desktop-file-install -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop +#desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop build/rpm/dolibarr.desktop %{__install} -m 644 build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop %{__mkdir} -p $RPM_BUILD_ROOT/usr/share/dolibarr/build/rpm