From dae4ed2909cfb02f606dfd644f25db2cc58c544a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 3 Aug 2011 00:45:22 +0000 Subject: [PATCH] Fix: Avoid errors into rpm packages --- build/deb/dolibarr.desktop | 4 - build/makepack-dolibarr.pl | 138 ++- build/rpm/dolibarr.spec | 173 ++- htdocs/admin/proxy.php | 7 +- htdocs/admin/security_other.php | 7 +- htdocs/boutique/index.php | 10 +- 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/cashdesk/validation_verif.php | 3 +- htdocs/compta/ajaxpayment.php | 15 +- htdocs/compta/bank/bankid_fr.php | 7 +- htdocs/compta/bank/fiche.php | 7 +- htdocs/compta/prelevement/create.php | 7 +- htdocs/core/class/cookie.class.php | 5 +- htdocs/filefunc.inc.php | 7 +- htdocs/imports/import.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/index.php | 7 +- htdocs/install/check.php | 5 +- htdocs/install/default.css | 5 +- htdocs/install/etape0.php | 5 +- htdocs/install/etape1.php | 5 +- htdocs/install/etape2.php | 5 +- htdocs/install/etape4.php | 5 +- htdocs/install/etape5.php | 5 +- htdocs/install/fileconf.php | 5 +- htdocs/install/inc.php | 13 +- htdocs/install/licence.php | 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_availability.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 | 330 ++++++ htdocs/langs/nl_BE/html/gpl.txt | 340 ++++++ htdocs/langs/nl_NL/html/gpl.txt | 339 ++++++ htdocs/lib/ajax.lib.php | 5 +- htdocs/main.inc.php | 5 +- htdocs/paybox/lib/paybox.lib.php | 3 +- htdocs/paypal/lib/paypal.lib.php | 3 +- htdocs/paypal/lib/paypalfunctions.lib.php | 5 +- htdocs/product/class/product.class.php | 5 +- htdocs/product/fiche.php | 7 +- .../class/companybankaccount.class.php | 5 +- htdocs/societe/rib.php | 7 +- htdocs/theme/auguria/style.css.php | 5 +- .../smartphone/theme/default/default.css.php | 5 +- 326 files changed, 2629 insertions(+), 1363 deletions(-) create mode 100644 htdocs/langs/es_ES/html/gpl.html create mode 100644 htdocs/langs/nl_BE/html/gpl.txt create mode 100644 htdocs/langs/nl_NL/html/gpl.txt diff --git a/build/deb/dolibarr.desktop b/build/deb/dolibarr.desktop index f4b471edf13..a48e5048dff 100644 --- a/build/deb/dolibarr.desktop +++ b/build/deb/dolibarr.desktop @@ -3,14 +3,10 @@ # It must be saved into directory /usr/share/applications Version=1.0 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 PME et associations -Comment[it]=Programma gestionale open source e gratuito per piccole e medie imprese, fondazioni e liberi professionisti # Command to open an URL # For Fedora: xdg-open # For Debian/Ubuntu: xdg-open or x-www-browser diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl index af7d522b167..20c5ba415e9 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.131 2011/08/03 01:43:26 eldy Exp $ +# \version $Id: makepack-dolibarr.pl,v 1.129 2011/08/01 18:22:26 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.131 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; +$REVISION='$Revision: 1.129 $'; $REVISION =~ /\s(.*)\s/; $REVISION=$1; $VERSION="1.0 (build $REVISION)"; @@ -306,23 +306,21 @@ 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/phpexcel`; + $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/includes/smarty`; #$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 @@ -445,60 +443,57 @@ if ($nboftargetok) { #rmdir "$BUILDROOT/$FILENAMETGZ2"; $ret=`rm -fr $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\""; + print "Copy $BUILDROOT/$PROJECT to $BUILDROOT/$FILENAMETGZ2\n"; + $cmd="cp -pr \"$BUILDROOT/$PROJECT\" \"$BUILDROOT/$FILENAMETGZ2\""; $ret=`$cmd`; print "Remove other files\n"; - $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/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/COPYING`; - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/COPYING`; + $ret=`rm -f $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable - $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/htdocs/theme/bureau2crea`; + $ret=`rm -fr $BUILDROOT/$FILENAMETGZ2/$PROJECT/htdocs/htdocs/theme/bureau2crea`; # Apache conf files - 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"`; + #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"`; # Dolibarr conf files # TODO @@ -523,21 +518,21 @@ if ($nboftargetok) { $ret=`chmod -R 755 $BUILDROOT/$FILENAMETGZ2`; $cmd="find $BUILDROOT/$FILENAMETGZ2 -type f -exec chmod 644 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/build -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/build -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/dev -name '*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/dev -name '*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $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=`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=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/geoip -name 'sample*.php' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; - $cmd="find $BUILDROOT/$FILENAMETGZ2/var/www/$PROJECT/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; + $cmd="find $BUILDROOT/$FILENAMETGZ2/htdocs/includes/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts -name '*.pl' -type f -exec chmod 755 {} \\; "; $ret=`$cmd`; # Build tgz @@ -574,7 +569,7 @@ if ($nboftargetok) { next; } - + if ($target eq 'DEB') { $olddir=getcwd(); @@ -613,7 +608,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.debianbin") || die "Error"; + open (SPECFROM,"<$SOURCE/build/deb/control.DEBIAN") || die "Error"; open (SPECTO,">$BUILDROOT/$PROJECT.tmp/DEBIAN/control") || die "Error"; while () { $_ =~ s/__VERSION__/$MAJOR.$MINOR.$newbuild/; @@ -667,7 +662,6 @@ 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`; @@ -687,7 +681,7 @@ if ($nboftargetok) { $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/php_writeexcel/LICENSE`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/tcpdf/LICENSE.TXT`; $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/COPYING`; - $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode`; + $ret=`rm -f $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/includes/barcode/php-barcode/genbarcode/genbarcode`; # To remove once stable $ret=`rm -fr $BUILDROOT/$PROJECT.tmp/usr/share/$PROJECT/htdocs/htdocs/theme/bureau2crea`; diff --git a/build/rpm/dolibarr.spec b/build/rpm/dolibarr.spec index e6996caa4b3..708546cf263 100644 --- a/build/rpm/dolibarr.spec +++ b/build/rpm/dolibarr.spec @@ -5,11 +5,6 @@ # 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__ @@ -17,12 +12,9 @@ Name: %{name} Version: %{version} Release: %{release} -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 +Summary: Dolibarr -License: GPLv2+ +License: GPL Packager: Laurent Destailleur (Eldy) Vendor: Dolibarr dev team @@ -64,12 +56,13 @@ Dolibarr was designed to provide only features you need and be easy to use. %description -l es -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. +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. %description -l fr Logiciel ERP & CRM de gestion de PME/PMI, autoentrepreneurs, @@ -78,12 +71,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 programmo gestionale per piccole e medie +Un programma gestionale open source e gratuito 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à. Progettato per poter fornire solo ciò di cui hai bisogno +attività. Dolibar è progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. -Programmo web, progettato per poter fornire solo ciò di +Dolibar è completamente web-based, progettato per poter fornire solo ciò di cui hai bisogno ed essere facile da usare. @@ -101,51 +94,49 @@ echo Building %{name}-%{version}-%{release} #---- install %install -%{__rm} -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT -%{__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 +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 # %{_datadir} = /usr/share -%{__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 +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/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 +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 #---- 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/dolibarr.png +%_datadir/pixmaps/* %_datadir/applications/%{name}.desktop /var/www/dolibarr/build/* /var/www/dolibarr/htdocs/* /var/www/dolibarr/scripts/* - -%defattr(0664, -, -, 0755) -%config(noreplace) %{_sysconfdir}/dolibarr/apache.conf -%config(noreplace) %{_sysconfdir}/dolibarr/file_contexts.dolibarr +/var/www/dolibarr/README +/var/www/dolibarr/COPYRIGHT +#%config /var/www/dolibarr/htdocs/conf/conf.php #---- post (after unzip during install) @@ -163,11 +154,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="%{_sysconfdir}/dolibarr/file_contexts.dolibarr" +export sefileorig="$targetdir/build/rpm/file_contexts.dolibarr" export seconfig="%{_sysconfdir}/selinux/targeted/contexts/files/file_contexts.dolibarr" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="/usr/share/dolibarr/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="/usr/share/dolibarr/install.lock" # Detect OS @@ -201,8 +192,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='' @@ -214,39 +205,36 @@ 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 ] then echo Create empty file $config touch $config - %{__chown} -R root:$apachegroup $config - %{__chmod} -R 660 $config + chown -R root:$apachegroup $config + chmod -R 660 $config 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 +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 - semanage fcontext -a -t httpd_sys_script_rw_t "/etc/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/usr/share/dolibarr(/.*?)" - semanage fcontext -a -t httpd_sys_script_rw_t "/var/www/dolibarr/install.lock" - restorecon -R -v /etc/dolibarr - restorecon -R -v /usr/share/dolibarr - restorecon -v /var/www/dolibarr/install.lock +if [ ! -f $seconfig ]; then + echo Create se config file $seconfig + cp $sefileorig $seconfig +# chmod a-x $apacheconfig +# chmod go-w $apacheconfig fi # Create a config link dolibarr.conf @@ -257,13 +245,25 @@ fi # Set permissions echo Set permission to $apacheuser:$apachegroup on $targetdir -%{__chown} -R $apacheuser:$apachegroup $targetdir -%{__chmod} -R a-w $targetdir -%{__chmod} u+w $targetdir +chown -R $apacheuser:$apachegroup $targetdir +chmod -R a-w $targetdir +chmod u+w $targetdir echo Set permission to $apacheuser:$apachegroup on $docdir -%{__chown} -R $apacheuser:$apachegroup $docdir -%{__chmod} -R o-w $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 @@ -274,12 +274,6 @@ 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 -----" @@ -307,9 +301,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" -#export config="/usr/share/dolibarr/htdocs/conf/conf.php" -export config="%{_sysconfdir}/dolibarr/conf.php" -export lockfile="$targetdir/install.lock" +#config="/usr/share/dolibarr/htdocs/conf/conf.php" +config="%{_sysconfdir}/dolibarr/conf.php" +lockfile="$targetdir/install.lock" # Detect OS @@ -344,7 +338,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 @@ -362,15 +356,18 @@ 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/htdocs/admin/proxy.php b/htdocs/admin/proxy.php index f02e3d6203a..2c284c5cae8 100755 --- a/htdocs/admin/proxy.php +++ b/htdocs/admin/proxy.php @@ -12,15 +12,14 @@ * 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 . */ /** * \file htdocs/admin/proxy.php * \ingroup core * \brief Page setup proxy to use for external web access - * \version $Id: proxy.php,v 1.6 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: proxy.php,v 1.7 2011/07/31 22:23:24 eldy Exp $ */ require("../main.inc.php"); @@ -206,5 +205,5 @@ dol_htmloutput_mesg($mesg); $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.6 $'); +llxFooter('$Date: 2011/07/31 22:23:24 $ - $Revision: 1.7 $'); ?> diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php index c0aaaa86213..c1d629f7b7b 100644 --- a/htdocs/admin/security_other.php +++ b/htdocs/admin/security_other.php @@ -13,15 +13,14 @@ * 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 . */ /** * \file htdocs/admin/security_other.php * \ingroup core * \brief Security options setup - * \version $Id: security_other.php,v 1.40 2011/07/29 21:04:27 eldy Exp $ + * \version $Id: security_other.php,v 1.41 2011/07/31 22:23:22 eldy Exp $ */ require("../main.inc.php"); @@ -348,5 +347,5 @@ $formfile->form_attach_new_file(DOL_URL_ROOT.'/admin/security_other.php',$langs- $db->close(); -llxFooter('$Date: 2011/07/29 21:04:27 $ - $Revision: 1.40 $'); +llxFooter('$Date: 2011/07/31 22:23:22 $ - $Revision: 1.41 $'); ?> diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index a0d12d3457c..17a59229716 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -17,10 +17,10 @@ */ /** - * \file htdocs/boutique/index.php - * \ingroup boutique - * \brief Page accueil zone boutique - * \version $Id: index.php,v 1.17 2011/08/03 01:17:17 eldy Exp $ + \file htdocs/boutique/index.php + \ingroup boutique + \brief Page accueil zone boutique + \version $Id: index.php,v 1.16 2011/08/03 00:45:46 eldy Exp $ */ require("../main.inc.php"); @@ -238,5 +238,5 @@ print ''; $dbosc->close(); -llxFooter('$Date: 2011/08/03 01:17:17 $ - $Revision: 1.17 $'); +llxFooter('$Date: 2011/08/03 00:45:46 $ - $Revision: 1.16 $'); ?> diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css index 698cceb4966..c79d46fbeb5 100644 --- a/htdocs/cashdesk/css/style.css +++ b/htdocs/cashdesk/css/style.css @@ -11,10 +11,11 @@ * 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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* \version $Id: style.css,v 1.4 2011/08/03 01:35:18 eldy Exp $ */ +/* \version $Id$ */ body { background: #eee; diff --git a/htdocs/cashdesk/javascript/dhtml.js b/htdocs/cashdesk/javascript/dhtml.js index 2d89cfd2388..f91946e11c0 100644 --- a/htdocs/cashdesk/javascript/dhtml.js +++ b/htdocs/cashdesk/javascript/dhtml.js @@ -12,7 +12,8 @@ * 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, see . + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // 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 '