From e235debe2ee0d32e853254bdbc3b1e633c83515e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 01:32:42 +0000 Subject: [PATCH] Fix: Avoid errors into rpm packages --- build/deb/changelog | 2 +- build/deb/config | 45 +- build/deb/postinst | 12 +- build/deb/postrm | 4 +- build/makepack-dolibarr.pl | 137 +-- build/rpm/README | 13 +- build/rpm/dolibarr.desktop | 3 +- build/rpm/dolibarr.spec | 157 +-- build/rpm/file_contexts.dolibarr | 6 +- htdocs/cashdesk/css/style.css | 5 +- htdocs/cashdesk/javascript/dhtml.js | 3 +- htdocs/cashdesk/tpl/menu.tpl.php | 13 +- htdocs/cashdesk/tpl/validation1.tpl.php | 21 +- htdocs/contrat/fiche.php | 6 +- htdocs/core/class/translate.class.php | 7 +- .../modules/export/export_csv.modules.php | 5 +- .../modules/export/export_excel.modules.php | 5 +- .../modules/export/export_tsv.modules.php | 8 +- .../modules/export/modules_export.php | 3 +- .../includes/odtphp/zip/pclzip/gnu-lgpl.txt | 1007 ++++++++--------- htdocs/includes/php_writeexcel/LICENSE | 3 +- htdocs/install/default.css | 5 +- htdocs/install/mysql/data/llx_00_c_pays.sql | 5 +- .../install/mysql/data/llx_10_c_regions.sql | 5 +- .../mysql/data/llx_20_c_departements.sql | 5 +- htdocs/install/mysql/data/llx_accounting.sql | 5 +- .../mysql/data/llx_c_action_trigger.sql | 5 +- .../install/mysql/data/llx_c_actioncomm.sql | 5 +- .../install/mysql/data/llx_c_availability.sql | 5 +- .../install/mysql/data/llx_c_barcode_type.sql | 5 +- .../mysql/data/llx_c_chargesociales.sql | 5 +- htdocs/install/mysql/data/llx_c_civilite.sql | 5 +- .../install/mysql/data/llx_c_currencies.sql | 5 +- htdocs/install/mysql/data/llx_c_ecotaxe.sql | 5 +- htdocs/install/mysql/data/llx_c_effectif.sql | 5 +- .../mysql/data/llx_c_forme_juridique.sql | 5 +- .../install/mysql/data/llx_c_input_method.sql | 5 +- .../install/mysql/data/llx_c_input_reason.sql | 5 +- htdocs/install/mysql/data/llx_c_paiement.sql | 5 +- .../install/mysql/data/llx_c_paper_format.sql | 5 +- .../install/mysql/data/llx_c_payment_term.sql | 5 +- htdocs/install/mysql/data/llx_c_propalst.sql | 5 +- .../mysql/data/llx_c_prospectlevel.sql | 5 +- .../mysql/data/llx_c_shipment_mode.sql | 7 +- htdocs/install/mysql/data/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/data/llx_c_tva.sql | 5 +- .../install/mysql/data/llx_c_type_contact.sql | 5 +- htdocs/install/mysql/data/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/data/llx_c_typent.sql | 5 +- htdocs/install/mysql/data/llx_const.sql | 5 +- htdocs/install/mysql/functions/functions.sql | 5 +- .../tables/llx_accountingaccount.key.sql | 5 +- .../mysql/tables/llx_accountingaccount.sql | 5 +- .../mysql/tables/llx_accountingdebcred.sql | 5 +- .../mysql/tables/llx_accountingsystem.sql | 5 +- .../tables/llx_accountingtransaction.sql | 5 +- .../mysql/tables/llx_actioncomm.key.sql | 5 +- .../install/mysql/tables/llx_actioncomm.sql | 5 +- .../install/mysql/tables/llx_adherent.key.sql | 5 +- htdocs/install/mysql/tables/llx_adherent.sql | 5 +- .../tables/llx_adherent_extrafields.key.sql | 5 +- .../mysql/tables/llx_adherent_extrafields.sql | 5 +- .../mysql/tables/llx_adherent_type.key.sql | 5 +- .../mysql/tables/llx_adherent_type.sql | 5 +- .../tables/llx_advanced_extrafields.key.sql | 5 +- .../mysql/tables/llx_advanced_extrafields.sql | 5 +- .../llx_advanced_extrafields_options.key.sql | 5 +- .../llx_advanced_extrafields_options.sql | 5 +- .../llx_advanced_extrafields_values.key.sql | 5 +- .../llx_advanced_extrafields_values.sql | 5 +- htdocs/install/mysql/tables/llx_bank.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank.sql | 5 +- .../mysql/tables/llx_bank_account.key.sql | 5 +- .../install/mysql/tables/llx_bank_account.sql | 5 +- .../install/mysql/tables/llx_bank_categ.sql | 5 +- .../mysql/tables/llx_bank_class.key.sql | 5 +- .../install/mysql/tables/llx_bank_class.sql | 5 +- .../install/mysql/tables/llx_bank_url.key.sql | 5 +- htdocs/install/mysql/tables/llx_bank_url.sql | 5 +- .../install/mysql/tables/llx_bookmark.key.sql | 5 +- htdocs/install/mysql/tables/llx_bookmark.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.key.sql | 5 +- .../mysql/tables/llx_bordereau_cheque.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes.sql | 5 +- .../mysql/tables/llx_boxes_def.key.sql | 5 +- htdocs/install/mysql/tables/llx_boxes_def.sql | 5 +- .../mysql/tables/llx_c_action_trigger.key.sql | 5 +- .../mysql/tables/llx_c_action_trigger.sql | 5 +- .../install/mysql/tables/llx_c_actioncomm.sql | 5 +- .../mysql/tables/llx_c_availability.key.sql | 5 +- .../mysql/tables/llx_c_barcode_type.sql | 5 +- .../mysql/tables/llx_c_chargesociales.sql | 5 +- .../install/mysql/tables/llx_c_civilite.sql | 5 +- .../mysql/tables/llx_c_currencies.key.sql | 5 +- .../install/mysql/tables/llx_c_currencies.sql | 5 +- .../mysql/tables/llx_c_departements.key.sql | 5 +- .../mysql/tables/llx_c_departements.sql | 5 +- .../mysql/tables/llx_c_ecotaxe.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ecotaxe.sql | 5 +- .../install/mysql/tables/llx_c_effectif.sql | 5 +- .../install/mysql/tables/llx_c_field_list.sql | 5 +- .../tables/llx_c_forme_juridique.key.sql | 5 +- .../mysql/tables/llx_c_forme_juridique.sql | 5 +- .../mysql/tables/llx_c_input_method.key.sql | 5 +- .../mysql/tables/llx_c_input_method.sql | 5 +- .../mysql/tables/llx_c_input_reason.key.sql | 5 +- .../mysql/tables/llx_c_input_reason.sql | 5 +- .../install/mysql/tables/llx_c_paiement.sql | 5 +- .../mysql/tables/llx_c_paper_format.sql | 5 +- .../mysql/tables/llx_c_payment_term.sql | 5 +- .../install/mysql/tables/llx_c_pays.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_pays.sql | 5 +- .../install/mysql/tables/llx_c_propalst.sql | 5 +- .../mysql/tables/llx_c_prospectlevel.sql | 5 +- .../mysql/tables/llx_c_regions.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_regions.sql | 5 +- .../mysql/tables/llx_c_shipment_mode.sql | 5 +- htdocs/install/mysql/tables/llx_c_stcomm.sql | 5 +- htdocs/install/mysql/tables/llx_c_tva.sql | 5 +- .../mysql/tables/llx_c_type_contact.key.sql | 5 +- .../mysql/tables/llx_c_type_contact.sql | 5 +- .../install/mysql/tables/llx_c_type_fees.sql | 5 +- htdocs/install/mysql/tables/llx_c_typent.sql | 5 +- .../mysql/tables/llx_c_ziptown.key.sql | 5 +- htdocs/install/mysql/tables/llx_c_ziptown.sql | 5 +- .../mysql/tables/llx_categorie.key.sql | 5 +- htdocs/install/mysql/tables/llx_categorie.sql | 5 +- .../tables/llx_categorie_association.key.sql | 5 +- .../tables/llx_categorie_association.sql | 5 +- .../tables/llx_categorie_fournisseur.sql | 5 +- .../mysql/tables/llx_categorie_member.key.sql | 5 +- .../mysql/tables/llx_categorie_member.sql | 5 +- .../tables/llx_categorie_product.key.sql | 5 +- .../mysql/tables/llx_categorie_product.sql | 5 +- .../tables/llx_categorie_societe.key.sql | 5 +- .../mysql/tables/llx_categorie_societe.sql | 5 +- .../mysql/tables/llx_chargesociales.sql | 5 +- .../install/mysql/tables/llx_commande.key.sql | 5 +- htdocs/install/mysql/tables/llx_commande.sql | 5 +- .../tables/llx_commande_fournisseur.key.sql | 7 +- .../mysql/tables/llx_commande_fournisseur.sql | 5 +- .../llx_commande_fournisseur_dispatch.key.sql | 5 +- .../llx_commande_fournisseur_dispatch.sql | 5 +- .../tables/llx_commande_fournisseur_log.sql | 5 +- .../tables/llx_commande_fournisseurdet.sql | 5 +- .../mysql/tables/llx_commandedet.key.sql | 5 +- .../install/mysql/tables/llx_commandedet.sql | 5 +- htdocs/install/mysql/tables/llx_compta.sql | 5 +- .../mysql/tables/llx_compta_account.sql | 5 +- .../tables/llx_compta_compte_generaux.sql | 5 +- htdocs/install/mysql/tables/llx_const.key.sql | 5 +- htdocs/install/mysql/tables/llx_const.sql | 5 +- .../install/mysql/tables/llx_contrat.key.sql | 7 +- htdocs/install/mysql/tables/llx_contrat.sql | 5 +- .../mysql/tables/llx_contratdet.key.sql | 5 +- .../install/mysql/tables/llx_contratdet.sql | 5 +- .../mysql/tables/llx_contratdet_log.key.sql | 5 +- .../mysql/tables/llx_contratdet_log.sql | 5 +- .../mysql/tables/llx_cotisation.key.sql | 5 +- .../install/mysql/tables/llx_cotisation.sql | 5 +- .../install/mysql/tables/llx_deplacement.sql | 5 +- htdocs/install/mysql/tables/llx_document.sql | 5 +- .../mysql/tables/llx_document_generator.sql | 5 +- .../mysql/tables/llx_document_model.key.sql | 5 +- .../mysql/tables/llx_document_model.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.key.sql | 5 +- .../mysql/tables/llx_dolibarr_modules.sql | 5 +- htdocs/install/mysql/tables/llx_domain.sql | 5 +- htdocs/install/mysql/tables/llx_don.sql | 5 +- .../mysql/tables/llx_ecm_directories.key.sql | 5 +- .../mysql/tables/llx_ecm_directories.sql | 5 +- .../mysql/tables/llx_ecm_documents.key.sql | 5 +- .../mysql/tables/llx_ecm_documents.sql | 5 +- .../mysql/tables/llx_element_contact.key.sql | 5 +- .../mysql/tables/llx_element_contact.sql | 5 +- .../mysql/tables/llx_element_element.key.sql | 5 +- .../mysql/tables/llx_element_element.sql | 5 +- .../install/mysql/tables/llx_element_lock.sql | 5 +- .../install/mysql/tables/llx_entrepot.key.sql | 5 +- htdocs/install/mysql/tables/llx_entrepot.sql | 5 +- .../install/mysql/tables/llx_events.key.sql | 5 +- htdocs/install/mysql/tables/llx_events.sql | 5 +- .../mysql/tables/llx_expedition.key.sql | 5 +- .../install/mysql/tables/llx_expedition.sql | 5 +- .../mysql/tables/llx_expeditiondet.key.sql | 5 +- .../mysql/tables/llx_expeditiondet.sql | 5 +- .../mysql/tables/llx_export_compta.sql | 5 +- .../mysql/tables/llx_export_model.key.sql | 5 +- .../install/mysql/tables/llx_export_model.sql | 5 +- .../mysql/tables/llx_extrafields.key.sql | 5 +- .../install/mysql/tables/llx_extrafields.sql | 5 +- .../install/mysql/tables/llx_facture.key.sql | 5 +- htdocs/install/mysql/tables/llx_facture.sql | 5 +- .../mysql/tables/llx_facture_fourn.key.sql | 5 +- .../mysql/tables/llx_facture_fourn.sql | 5 +- .../tables/llx_facture_fourn_det.key.sql | 5 +- .../mysql/tables/llx_facture_fourn_det.sql | 5 +- .../mysql/tables/llx_facture_rec.key.sql | 5 +- .../install/mysql/tables/llx_facture_rec.sql | 5 +- .../mysql/tables/llx_facturedet.key.sql | 5 +- .../install/mysql/tables/llx_facturedet.sql | 5 +- .../mysql/tables/llx_facturedet_rec.sql | 5 +- .../mysql/tables/llx_fichinter.key.sql | 5 +- htdocs/install/mysql/tables/llx_fichinter.sql | 5 +- .../mysql/tables/llx_fichinterdet.key.sql | 5 +- .../install/mysql/tables/llx_fichinterdet.sql | 5 +- .../mysql/tables/llx_import_model.key.sql | 5 +- .../install/mysql/tables/llx_import_model.sql | 5 +- .../mysql/tables/llx_livraison.key.sql | 5 +- htdocs/install/mysql/tables/llx_livraison.sql | 5 +- .../mysql/tables/llx_livraisondet.key.sql | 5 +- .../install/mysql/tables/llx_livraisondet.sql | 5 +- htdocs/install/mysql/tables/llx_mailing.sql | 5 +- .../mysql/tables/llx_mailing_cibles.key.sql | 5 +- .../mysql/tables/llx_mailing_cibles.sql | 5 +- htdocs/install/mysql/tables/llx_menu.key.sql | 5 +- htdocs/install/mysql/tables/llx_menu.sql | 5 +- htdocs/install/mysql/tables/llx_notify.sql | 5 +- .../install/mysql/tables/llx_notify_def.sql | 5 +- htdocs/install/mysql/tables/llx_paiement.sql | 5 +- .../mysql/tables/llx_paiement_facture.key.sql | 5 +- .../mysql/tables/llx_paiement_facture.sql | 5 +- .../mysql/tables/llx_paiementcharge.sql | 5 +- .../mysql/tables/llx_paiementfourn.sql | 5 +- .../llx_paiementfourn_facturefourn.key.sql | 7 +- .../tables/llx_paiementfourn_facturefourn.sql | 5 +- htdocs/install/mysql/tables/llx_pos_tmp.sql | 5 +- .../mysql/tables/llx_prelevement_bons.key.sql | 5 +- .../mysql/tables/llx_prelevement_bons.sql | 5 +- .../tables/llx_prelevement_facture.key.sql | 5 +- .../mysql/tables/llx_prelevement_facture.sql | 5 +- .../llx_prelevement_facture_demande.sql | 5 +- .../tables/llx_prelevement_lignes.key.sql | 5 +- .../mysql/tables/llx_prelevement_lignes.sql | 5 +- .../mysql/tables/llx_prelevement_rejet.sql | 5 +- .../install/mysql/tables/llx_product.key.sql | 5 +- htdocs/install/mysql/tables/llx_product.sql | 5 +- .../tables/llx_product_association.key.sql | 5 +- .../mysql/tables/llx_product_association.sql | 5 +- .../install/mysql/tables/llx_product_ca.sql | 5 +- .../tables/llx_product_extrafields.key.sql | 5 +- .../mysql/tables/llx_product_extrafields.sql | 5 +- .../tables/llx_product_fournisseur.key.sql | 5 +- .../mysql/tables/llx_product_fournisseur.sql | 5 +- .../llx_product_fournisseur_price.key.sql | 5 +- .../tables/llx_product_fournisseur_price.sql | 5 +- .../llx_product_fournisseur_price_log.sql | 5 +- .../mysql/tables/llx_product_lang.key.sql | 5 +- .../install/mysql/tables/llx_product_lang.sql | 5 +- .../mysql/tables/llx_product_price.sql | 5 +- .../mysql/tables/llx_product_stock.key.sql | 5 +- .../mysql/tables/llx_product_stock.sql | 5 +- .../install/mysql/tables/llx_projet.key.sql | 5 +- htdocs/install/mysql/tables/llx_projet.sql | 5 +- .../mysql/tables/llx_projet_task.key.sql | 5 +- .../install/mysql/tables/llx_projet_task.sql | 5 +- .../mysql/tables/llx_projet_task_time.sql | 5 +- .../install/mysql/tables/llx_propal.key.sql | 5 +- htdocs/install/mysql/tables/llx_propal.sql | 5 +- .../mysql/tables/llx_propaldet.key.sql | 5 +- htdocs/install/mysql/tables/llx_propaldet.sql | 5 +- .../mysql/tables/llx_rights_def.key.sql | 5 +- .../install/mysql/tables/llx_rights_def.sql | 5 +- .../install/mysql/tables/llx_societe.key.sql | 5 +- htdocs/install/mysql/tables/llx_societe.sql | 5 +- .../mysql/tables/llx_societe_address.sql | 5 +- .../tables/llx_societe_commerciaux.key.sql | 5 +- .../mysql/tables/llx_societe_commerciaux.sql | 5 +- .../tables/llx_societe_extrafields.key.sql | 5 +- .../mysql/tables/llx_societe_extrafields.sql | 5 +- .../install/mysql/tables/llx_societe_log.sql | 5 +- .../mysql/tables/llx_societe_prices.sql | 5 +- .../mysql/tables/llx_societe_remise.sql | 5 +- .../tables/llx_societe_remise_except.key.sql | 5 +- .../tables/llx_societe_remise_except.sql | 5 +- .../install/mysql/tables/llx_societe_rib.sql | 5 +- .../mysql/tables/llx_socpeople.key.sql | 5 +- htdocs/install/mysql/tables/llx_socpeople.sql | 5 +- .../mysql/tables/llx_stock_mouvement.key.sql | 5 +- .../mysql/tables/llx_stock_mouvement.sql | 5 +- htdocs/install/mysql/tables/llx_texts.sql | 5 +- htdocs/install/mysql/tables/llx_tva.sql | 5 +- htdocs/install/mysql/tables/llx_user.key.sql | 5 +- htdocs/install/mysql/tables/llx_user.sql | 5 +- .../install/mysql/tables/llx_user_alert.sql | 5 +- .../mysql/tables/llx_user_clicktodial.sql | 5 +- .../mysql/tables/llx_user_param.key.sql | 5 +- .../install/mysql/tables/llx_user_param.sql | 5 +- .../mysql/tables/llx_user_rights.key.sql | 5 +- .../install/mysql/tables/llx_user_rights.sql | 5 +- .../mysql/tables/llx_usergroup.key.sql | 5 +- htdocs/install/mysql/tables/llx_usergroup.sql | 5 +- .../mysql/tables/llx_usergroup_rights.key.sql | 5 +- .../mysql/tables/llx_usergroup_rights.sql | 5 +- .../mysql/tables/llx_usergroup_user.key.sql | 5 +- .../mysql/tables/llx_usergroup_user.sql | 5 +- htdocs/install/pgsql/functions/functions.sql | 5 +- htdocs/langs/es_ES/html/gpl.html | 3 +- htdocs/langs/nl_BE/html/gpl.txt | 4 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- 304 files changed, 1302 insertions(+), 1579 deletions(-) diff --git a/build/deb/changelog b/build/deb/changelog index b035f18ae1d..3382966714b 100644 --- a/build/deb/changelog +++ b/build/deb/changelog @@ -4,6 +4,6 @@ dolibarr (3.1.0-1.1) unstable; urgency=low * New upstream release. closes: bug#634783 - -- Laurent Destailleur Mon, 30 Jul 2011 12:00:00 +0100 + -- Dolibarr team Mon, 30 Jul 2011 12:00:00 +0100 # For a changelog file dedicated to users, see /usr/share/doc/dolibarr/UserChangeLog.gz file. \ No newline at end of file diff --git a/build/deb/config b/build/deb/config index fd5ea96491b..553e5ffd7f6 100644 --- a/build/deb/config +++ b/build/deb/config @@ -13,25 +13,29 @@ db_version 2.0 echo Run the dolibarr config script # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/apache.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/apache.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi # Rotate old configuration -if [ "$1" = "reconfigure" ] ; then - config="/etc/dolibarr/lighttpd.conf" - for i in $(seq 8 -1 0) ; do - if [ -f ${config}.$i ] ; then - mv ${config}.$i ${config}.$(($i +1)) - fi - done - mv ${config} ${config}.0 -fi +#if [ "$1" = "reconfigure" ] ; then +# config="/etc/dolibarr/lighttpd.conf" +# if [ -f $config ] ; then +# for i in $(seq 8 -1 0) ; do +# if [ -f ${config}.$i ] ; then +# mv ${config}.$i ${config}.$(($i +1)) +# fi +# done +# mv ${config} ${config}.0 +# fi +#fi db_capb backup @@ -39,8 +43,9 @@ db_capb backup db_title "dolibarr" || true -# Ask for web server type. -#db_input critical "dolibarr/webserver" || true +# Ask if we must delete database +echo "Ask for web server to setup" +db_input critical dolibarr/reconfigure-webserver || true if db_go ; then okcancel="1" diff --git a/build/deb/postinst b/build/deb/postinst index 9f103d8876d..e0bba1be4da 100644 --- a/build/deb/postinst +++ b/build/deb/postinst @@ -20,7 +20,7 @@ lighttpd_install() { if [ ! -f /etc/lighttpd/conf-available/50-dolibarr.conf ] ; then if which lighty-enable-mod >/dev/null 2>&1 ; then echo "Add link for Lighttpd config file" - ln -s /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf + ln -fs /etc/dolibarr/lighttpd.conf /etc/lighttpd/conf-available/50-dolibarr.conf # We enabled it lighty-enable-mod dolibarr fastcgi-php else @@ -33,7 +33,7 @@ apache_install() { webserver=$1 if [ -d /etc/$webserver/conf.d ] && [ ! -e /etc/$webserver/conf.d/dolibarr.conf ]; then echo "Add link for Apache config file" - ln -s /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf + ln -fs /etc/dolibarr/apache.conf /etc/$webserver/conf.d/dolibarr.conf fi } @@ -92,14 +92,6 @@ case "$1" in fi - # Reconfigure web server - db_reset dolibarr/reconfigure-webserver - - # Ask if we must delete database - echo "Ask for web server to setup" - db_input critical dolibarr/reconfigure-webserver || true - db_go || true - db_get dolibarr/reconfigure-webserver webservers="$RET" diff --git a/build/deb/postrm b/build/deb/postrm index dd05ee90379..27ce3777b7e 100644 --- a/build/deb/postrm +++ b/build/deb/postrm @@ -65,10 +65,12 @@ case "$1" in # Call when we upgrade upgrade) + echo "postrm upgrade" ;; # Call when we uninstall remove) + echo "postrm remove" rm -f $lockfile # Reconfigure web server @@ -98,7 +100,7 @@ case "$1" in # Call when we uninstall and purge purge) - echo "postrm purge webservers=$webservers" + echo "postrm purge" # Ask if we must delete database echo "postrm db_input dolibarr/postrm" diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index 20c5ba415e9..f1527da165b 100644 --- a/build/makepack-dolibarr.pl +++ b/build/makepack-dolibarr.pl @@ -2,7 +2,7 @@ #---------------------------------------------------------------------------- # \file build/makepack-dolibarr.pl # \brief Dolibarr package builder (tgz, zip, rpm, deb, exe, aps) -# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.130 2011/08/03 00:47:37 eldy Exp $ # \author (c)2004-2011 Laurent Destailleur #---------------------------------------------------------------------------- @@ -48,7 +48,7 @@ if (-d "/usr/src/RPM") { use vars qw/ $REVISION $VERSION /; -$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.130 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,21 +306,23 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT/Thumbs.db $BUILDROOT/$PROJECT/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/Thumbs.db $BUILDROOT/$PROJECT/*/*/*/*/Thumbs.db`; $ret=`rm -fr $BUILDROOT/$PROJECT/CVS* $BUILDROOT/$PROJECT/*/CVS* $BUILDROOT/$PROJECT/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/CVS* $BUILDROOT/$PROJECT/*/*/*/*/*/*/*/*/*/*/CVS*`; $ret=`rm -fr $BUILDROOT/$PROJECT/.cvsignore $BUILDROOT/$PROJECT/*/.cvsignore $BUILDROOT/$PROJECT/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/.cvsignore $BUILDROOT/$PROJECT/*/*/*/*/*/*/.cvsignore`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; + $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/php_writeexcel/php.bmp`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; - $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/phpexcel`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/freetype6.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/zlib1.dll`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/pfm2afm`; #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/phpexcel/PHPExcel/Shared/PDF/fonts/utils/ttf2ufm`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/dejavu-fonts-ttf-2.33`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/freefont-20100919`; $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/pfm2afm`; - #$ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/tcpdf/fonts/utils/ttf2ufm`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/flot/jquery.min.js`; - $ret=`rm -f $BUILDROOT/$PROJECT/htdocs/includes/jquery/plugins/jcrop/js/jquery.min.js`; } # Build package for each target @@ -443,57 +445,61 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2`; - print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; - $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; + print "Create directory $BUILDROOT/$FILENAMETGZ2/var/www\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/var/www"`; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT\""; $ret=`$cmd`; print "Remove other files\n"; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/README-FR`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/aps`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/dmg`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/pad/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/tgz/README`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/deb/README`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/doap`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/exe`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/live`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/patch`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/zip`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/build/perl`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/dbmodel`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/initdata`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/iso-normes`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpcheckstyle`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/dev/phpunit`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/flyer`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/font`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/tshirt`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/doc/rollup`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/test`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/fpdf/fpdf`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/nusoap/lib/Mail`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/smarty`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/README-FR`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/README-FR`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/aps`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/dmg`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/pad/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/tgz/README`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/deb/README`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/doap`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/exe`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/live`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/patch`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/zip`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build/perl`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/dbmodel`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/initdata`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/iso-normes`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpcheckstyle`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/phpunit`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/flyer`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/font`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/tshirt`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/doc/rollup`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/test`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/doc/html/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/cashdesk/include/jscalendar/skins/aqua/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/dialogs/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/ckeditor/plugins/*/images/CVS`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fpdf/fpdf`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/nusoap/lib/Mail`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/odtphp/zip/pclzip/.svn`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/smarty`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; - $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - #print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf\n"; - #$ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; - #$ret=`cp "$SOURCE/build/deb/apache.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + print "Copy apache.conf file into $BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/httpd-dolibarr.conf\n"; + $ret=`mkdir -p "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT"`; + $ret=`cp "$SOURCE/build/rpm/httpd-dolibarr.conf" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/apache.conf"`; + $ret=`cp "$SOURCE/build/rpm/file_contexts.dolibarr" "$BUILDROOT/$FILENAMETGZ2/etc/$PROJECT/file_contexts.dolibarr"`; # Dolibarr conf files # TODO @@ -518,21 +524,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/translation/langAutoParser.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_page.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/modMyModule.class.php`; - $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/dev/skeletons/skeleton_class.class.php`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/translation/langAutoParser.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_page.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/modMyModule.class.php`; + $ret=`chmod -R 644 $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev/skeletons/skeleton_class.class.php`; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/scripts -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -569,7 +575,7 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { $olddir=getcwd(); @@ -608,7 +614,7 @@ if ($nboftargetok) { $ret=`rm -fr "$BUILDROOT/$PROJECT.tmp/DEBIAN/po/CVS*"`; print "Edit version in file $BUILDROOT/$PROJECT.tmp/DEBIAN/control\n"; - open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.debianbin") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -662,6 +668,7 @@ if ($nboftargetok) { $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/iso-normes`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpcheckstyle`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/dev/phpunit`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/*/README`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/flyer`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/font`; $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/doc/tshirt`; diff --git a/build/rpm/README b/build/rpm/README index 99a1bb3552c..f20bf91db72 100644 --- a/build/rpm/README +++ b/build/rpm/README @@ -5,17 +5,24 @@ RPM Package tools This directory contains files used by makepack-dolibarr.pl script to build a package, ready to be distributed, -with format RPM (for Redhat, Mandriva, ...). +with format RPM (for Redhat, OpenSuse, Mandriva, ...). -# This is standard command to work on Debian packaging: +# This is standard command to work on RPM packaging: +# +# yum -y install rpmlint +# yum -y install hunspell-en hunspell-es hunspell-fr hunspell-it # # rpmlint file.rpm Test a package +# mock -r fedora-15-i386 --rebuild ../SRPMS/hello-2.7-1.fc15.src.rpm # # On Fedora # rpm -i --test dolibarr-...rpm To list dependencies of RPM # yum install dolibarr-...rpm To install package and dependencies -# yum erase dolibarr To remove package +# yum erase dolibarr To remove package +# chcon -R -h -t httpd_sys_script_rw_t /file To add temporary context rw for httpd on /file +# semanage fcontext -a -t httpd_sys_script_rw_t "/dir/(.*)?" To add persistent context rw for httpd on /dir (this add file_contexts.local) +# restorecon -R -v /file Restore values into files (cancel chcon, validate semanage) # # On OpenSuse # yast --install dolibarr-...rpm To install package and dependencies diff --git a/build/rpm/dolibarr.desktop b/build/rpm/dolibarr.desktop index 4b4fb60dadb..337b92d8049 100755 --- a/build/rpm/dolibarr.desktop +++ b/build/rpm/dolibarr.desktop @@ -4,13 +4,14 @@ Version=1.0 Encoding=UTF-8 Name=Dolibarr ERP & CRM +Name[es]=Dolibarr ERP & CRM Name[fr]=Dolibarr ERP & CRM Name[it]=Dolibarr ERP & CRM GenericName=Dolibarr ERP & CRM Comment=The easy to use manager (ERP & CRM) for small and medium enterprises or foundations +Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones Comment[fr]=L'ERP & CRM simple pour la gestion des TPE, PME, associations et auto-entrepreneurs Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti -Comment[es]=Software para gestión de PYMES, profesionales independientes, auto emprendedores ó asociaciones # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index 708546cf263..08fe933d774 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,6 +5,11 @@ # file to build a package for your own distributions and # edit it if you need to match your rules. # -------------------------------------------------------- + +#%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0) +#%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0) +#%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0) + %define name dolibarr %define version __VERSION__ %define release __RELEASE__ @@ -12,9 +17,12 @@ Name: %{name} Version: %{version} Release: %{release} -Summary: Dolibarr +Summary: ERP and CRM software for small and medium companies or foundations +Summary(es): Software ERP y CRM para pequeñas y medianas empresas o, asociaciones o autónomos +Summary(fr): Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs ou associations +Summary(it): Programmo gestionale per piccole imprese, fondazioni e liberi professionisti -License: GPL +License: GPLv2+ Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -56,13 +64,12 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -Un software ERP y CRM open source/gratis para pequeñas y -medianas empresas, asociaciones o autónomos. Incluye diferentes -funcionalidades para la Planificación de Recursos Empresariales (ERP) y -Gestión de la Relación con los Clientes (CRM) así como para para otras -diferentes actividades. Dolibarr ha sido diseñado para suministrarle -solamente las funcionalidades que necesita y haciendo hincapié en su -facilidad de uso. +Un software ERP y CRM para pequeñas y medianas empresas, asociaciones +o autónomos. Incluye diferentes funcionalidades para la Planificación +de Recursos Empresariales (ERP) y Gestión de la Relación con los +Clientes (CRM) así como para para otras diferentes actividades. +Dolibarr ha sido diseñado para suministrarle solamente las funcionalidades +que necesita y haciendo hincapié en su facilidad de uso. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -71,12 +78,12 @@ fournisseurs, devis, factures, comptes bancaires, agenda, campagne emailings et bien d'autres choses dans une interface pensée pour la simplicité. %description -l it -Un programma gestionale open source e gratuito per piccole e medie +Un programmo gestionale per piccole e medie imprese, fondazioni e liberi professionisti. Include varie funzionalità per Enterprise Resource Planning e gestione dei clienti (CRM), ma anche ulteriori -attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno +attività. Progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Dolibar è completamente web-based, progettato per poter fornire solo ciò di +Programmo web, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -94,49 +101,51 @@ echo Building %{name}-%{version}-%{release} #---- install %install -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/build -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/doc -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs -mkdir -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr +%{__install} -m 644 etc/dolibarr/apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/apache.conf +%{__install} -m 644 etc/dolibarr/file_contexts.dolibarr $RPM_BUILD_ROOT%{_sysconfdir}/dolibarr/file_contexts.dolibarr # %{_datadir} = /usr/share -mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps -cp doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -cp build/rpm/dolibarr.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/dolibarr.desktop +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/pixmaps +%{__install} -m 644 var/www/dolibarr/doc/images/dolibarr_48x48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/dolibarr.png +%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/applications +%{__install} -m 644 var/www/dolibarr/build/rpm/dolibarr.desktop $RPM_BUILD_ROOT%{_datadir}/applications/dolibarr.desktop -install -m 444 README $RPM_BUILD_ROOT/var/www/dolibarr/README -install -m 444 COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/COPYRIGHT -cp -pr build $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr doc $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr htdocs $RPM_BUILD_ROOT/var/www/dolibarr -cp -pr scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/build +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/doc +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/htdocs +%{__mkdir} -p $RPM_BUILD_ROOT/var/www/dolibarr/scripts +%{__cp} -pr var/www/dolibarr/build $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/doc $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/htdocs $RPM_BUILD_ROOT/var/www/dolibarr +%{__cp} -pr var/www/dolibarr/scripts $RPM_BUILD_ROOT/var/www/dolibarr +%{__install} -m 644 var/www/dolibarr/COPYRIGHT $RPM_BUILD_ROOT/var/www/dolibarr/doc/COPYRIGHT #---- clean %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf $RPM_BUILD_ROOT #---- files %files + %defattr(-,root,root) -%doc README -%doc COPYRIGHT %doc /var/www/dolibarr/doc/* %dir /var/www/dolibarr/build %dir /var/www/dolibarr/htdocs %dir /var/www/dolibarr/scripts -%_datadir/pixmaps/* +%_datadir/pixmaps/dolibarr.png %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* -/var/www/dolibarr/README -/var/www/dolibarr/COPYRIGHT -#%config /var/www/dolibarr/htdocs/conf/conf.php + +%defattr(0664, -, -, 0755) +%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf +%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr #---- post (after unzip during install) @@ -154,11 +163,11 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" +export sefileorig="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="/usr/share/dolibarr/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -192,8 +201,8 @@ echo OS detected: $os # Create empty directory for uploaded files and generated documents echo Create document directory $docdir -mkdir -p $docdir -mkdir -p %{_sysconfdir}/dolibarr +%{__mkdir} -p $docdir +%{__mkdir} -p %{_sysconfdir}/dolibarr # Create install.forced.php into Dolibarr install directory superuserlogin='' @@ -205,12 +214,12 @@ if [ -f %{_sysconfdir}/mysql/debian.cnf ] ; then fi echo Mysql superuser found to use is $superuserlogin if [ -z "$superuserlogin" ] ; then - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/root/g' | sed -e 's/__SUPERUSERPASSWORD__//g' > $installconfig else - cat $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig + %{__cat} $installfileorig | sed -e 's/__SUPERUSERLOGIN__/'$superuserlogin'/g' | sed -e 's/__SUPERUSERPASSWORD__/'$superuserpassword'/g' > $installconfig fi -chown -R root:$apachegroup $installconfig -chmod -R 660 $installconfig +%{__chown} -R root:$apachegroup $installconfig +%{__chmod} -R 660 $installconfig # Create an empty conf.php with permission to web server if [ ! -f $config ] @@ -222,19 +231,20 @@ then fi # Create config file for apache $apacheconfig -if [ ! -f $apacheconfig ]; then - echo Create dolibarr web server config file $apacheconfig - cp $apachefileorig $apacheconfig - chmod a-x $apacheconfig - chmod go-w $apacheconfig -fi - -# Create config file for se $seconfig -if [ ! -f $seconfig ]; then - echo Create se config file $seconfig - cp $sefileorig $seconfig +#if [ ! -f $apacheconfig ]; then +# echo Create dolibarr web server config file $apacheconfig +# cp $apachefileorig $apacheconfig # chmod a-x $apacheconfig # chmod go-w $apacheconfig +#fi + +# Create config file for se $seconfig +if [ "x$os" = "xfedora-redhat" -a -s /sbin/restorecon -a ! -f $seconfig ]; then + echo Add SE Linux permission from file $sefileorig +# cp $sefileorig $seconfig + restorecon -R -v /etc/dolibarr + restorecon -R -v /var/www/dolibarr + restorecon -R -v /usr/share/dolibarr fi # Create a config link dolibarr.conf @@ -253,18 +263,6 @@ echo Set permission to $apacheuser:$apachegroup on $docdir chown -R $apacheuser:$apachegroup $docdir chmod -R o-w $docdir -# Set SE Linux on OS SE is enabled -if [ "x$os" = "xfedora-redhat" -a -s /usr/bin/chcon ]; then - echo Set SELinux permissions - # Warning: chcon seems not cumulative - #chcon -R -h -t httpd_sys_content_t $targetdir - #chcon -R -h -t httpd_sys_content_t $docdir - chcon -R -h -t httpd_sys_script_rw_t $targetdir - chcon -R -h -t httpd_sys_script_rw_t $docdir - chcon -R -h -t httpd_sys_script_rw_t %{_sysconfdir}/dolibarr - #chcon -R -h -t httpd_sys_script_exec_t $targetdir -fi - # Restart web server echo Restart web server if [ -f %{_sysconfdir}/init.d/httpd ]; then @@ -274,6 +272,12 @@ if [ -f %{_sysconfdir}/init.d/apache2 ]; then %{_sysconfdir}/init.d/apache2 restart fi +# Restart mysql +echo Restart mysql +if [ -f /etc/init.d/mysqld ]; then + /etc/init.d/mysqld restart +fi + # Show result echo echo "----- Dolibarr %version - (c) Dolibarr dev team -----" @@ -301,9 +305,9 @@ export installfileorig="$targetdir/build/rpm/install.forced.php.install" export installconfig="%{_sysconfdir}/dolibarr/install.forced.php" export apachefileorig="$targetdir/build/rpm/httpd-dolibarr.conf" export apacheconfig="%{_sysconfdir}/dolibarr/apache.conf" -#config="/usr/share/dolibarr/htdocs/conf/conf.php" -config="%{_sysconfdir}/dolibarr/conf.php" -lockfile="$targetdir/install.lock" +#export config="/usr/share/dolibarr/htdocs/conf/conf.php" +export config="%{_sysconfdir}/dolibarr/conf.php" +export lockfile="$targetdir/install.lock" # Detect OS @@ -338,7 +342,7 @@ echo OS detected: $os if [ -f $apachelink ] ; then echo Delete apache config link for Dolibarr - rm -f $apachelink + %{__rm} -f $apachelink status=purge fi @@ -356,18 +360,15 @@ then fi # Removed dirs after apache restart -echo Removed remaining $apacheconfig -rm -f $apacheconfig echo Removed remaining $config -rm -f $config +%{__rm} -f $config echo Removed remaining $installconfig -rm -f $installconfig +%{__rm} -f $installconfig echo Removed remaining $lockfile -rm -f $lockfile +%{__rm} -f $lockfile echo Removed remaining dir $targetdir/doc rmdir $targetdir/doc >/dev/null 2>&1 -#echo Removed remaining dir $targetdir/htdocs -#rmdir $targetdir/htdocs >/dev/null 2>&1 # Already removed by rpm + %changelog * Wed Jul 31 2011 Laurent Destailleur 3.1.0-0.2.beta1 diff --git a/build/rpm/file_contexts.dolibarr b/build/rpm/file_contexts.dolibarr index 64376e5afb6..193a43b7dbe 100755 --- a/build/rpm/file_contexts.dolibarr +++ b/build/rpm/file_contexts.dolibarr @@ -1,3 +1,3 @@ -/etc/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/var/www/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 -/usr/share/dolibarr/.* system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file +/etc/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/var/www/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 +/usr/share/dolibarr(/.*?) system_u:object_r:httpd_sys_script_rw_t:s0 \ No newline at end of file diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index c79d46fbeb5..698cceb4966 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,11 +11,10 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ -/* \version $Id$ */ +/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index f91946e11c0..2d89cfd2388 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,8 +12,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ // Instanciation et initialisation de l'objet xmlhttprequest diff --git a/htdocs/cashdesk/tpl/menu.tpl.php b/htdocs/cashdesk/tpl/menu.tpl.php index 83dac68a99e..8b82c9f8249 100644 --- a/htdocs/cashdesk/tpl/menu.tpl.php +++ b/htdocs/cashdesk/tpl/menu.tpl.php @@ -15,8 +15,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * along with this program. If not, see . */ include_once(DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php'); @@ -63,11 +62,13 @@ $logout=''; print '