From 6347ba461407f227143949602b9fe2b94581c329 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Sep 2011 18:26:42 +0000 Subject: [PATCH] Work on rpm package --- build/rpm/dolibarr_fedora.spec | 5 +---- build/rpm/dolibarr_generic.spec | 9 +++------ build/rpm/dolibarr_mandriva.spec | 9 +++------ build/rpm/dolibarr_opensuse.spec | 9 +++------ 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index de306440d3f..d3fd767bd6a 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -98,13 +98,10 @@ cui hai bisogno ed essere facile da usare. %{__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 %{__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 #---- clean @@ -121,7 +118,7 @@ cui hai bisogno ed essere facile da usare. %_datadir/dolibarr/scripts/* %defattr(-, root, root, 0755) -#%doc %_datadir/doc/dolibarr +%doc COPYRIGHT doc/index.html %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 cb60321ce45..8fef8faaa68 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -97,13 +97,10 @@ cui hai bisogno ed essere facile da usare. %{__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 %{__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 #---- clean @@ -120,7 +117,7 @@ cui hai bisogno ed essere facile da usare. %_datadir/dolibarr/scripts/* %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr +%doc COPYRIGHT doc/index.html %dir %_datadir/dolibarr/build/rpm %dir %_datadir/dolibarr/build/tgz %dir %_datadir/dolibarr/htdocs @@ -196,7 +193,7 @@ if [ -d %{_sysconfdir}/apache2/conf.d -a `grep ^www-data /etc/passwd | wc -l` -g fi echo OS detected: $os -# Remove lock file +# Remove dolibarr install/upgrade lock file if it exists %{__rm} -f $docdir/install.lock # Create empty directory for uploaded files and generated documents @@ -264,7 +261,7 @@ echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" echo "web browser:" echo "http://localhost/dolibarr/" -echo "--------------------------------------------------" +echo "-------------------------------------------------------" echo diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec index 7056868e350..4026f8e1964 100755 --- a/build/rpm/dolibarr_mandriva.spec +++ b/build/rpm/dolibarr_mandriva.spec @@ -97,13 +97,10 @@ cui hai bisogno ed essere facile da usare. %{__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 %{__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 #---- clean @@ -120,7 +117,7 @@ cui hai bisogno ed essere facile da usare. %_datadir/dolibarr/scripts/* %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr +%doc COPYRIGHT doc/index.html %dir %_datadir/dolibarr/build/rpm %dir %_datadir/dolibarr/build/tgz %dir %_datadir/dolibarr/htdocs @@ -147,7 +144,7 @@ export apachelink="%{_sysconfdir}/httpd/conf.d/dolibarr.conf" export apacheuser='apache'; export apachegroup='apache'; -# Remove lock file +# Remove dolibarr install/upgrade lock file if it exists %{__rm} -f $docdir/install.lock # Create empty directory for uploaded files and generated documents @@ -190,7 +187,7 @@ echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" echo "web browser:" echo "http://localhost/dolibarr/" -echo "--------------------------------------------------" +echo "-------------------------------------------------------" echo diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec index 0ba2275f3e8..95f32b88705 100755 --- a/build/rpm/dolibarr_opensuse.spec +++ b/build/rpm/dolibarr_opensuse.spec @@ -95,13 +95,10 @@ cui hai bisogno ed essere facile da usare. %{__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 %{__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 # Enable this command to tag desktop file for suse #%suse_update_desktop_file dolibarr @@ -124,7 +121,7 @@ cui hai bisogno ed essere facile da usare. %_datadir/dolibarr/scripts/* %defattr(-, root, root, 0755) -%doc %_datadir/doc/dolibarr +%doc COPYRIGHT doc/index.html %dir %_datadir/dolibarr/build/rpm %dir %_datadir/dolibarr/build/tgz %dir %_datadir/dolibarr/htdocs @@ -151,7 +148,7 @@ export apachelink="%{_sysconfdir}/apache2/conf.d/dolibarr.conf" export apacheuser='wwwrun'; export apachegroup='www'; -# Remove lock file +# Remove dolibarr install/upgrade lock file if it exists %{__rm} -f $docdir/install.lock # Create empty directory for uploaded files and generated documents @@ -194,7 +191,7 @@ echo "To finish installation and use Dolibarr, click on the menu" echo "entry Dolibarr ERP-CRM or call the following page from your" echo "web browser:" echo "http://localhost/dolibarr/" -echo "--------------------------------------------------" +echo "-------------------------------------------------------" echo