From fc984b2a017a0a81423ee98bcb047d41d5442867 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 21 Aug 2011 17:08:05 +0000 Subject: [PATCH] Work on rpm and deb package --- COPYRIGHT | 2 -- build/deb/copyright | 10 ++-------- build/rpm/dolibarr_fedora.spec | 1 + 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/COPYRIGHT b/COPYRIGHT index ec878e38ef7..ecbde393096 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -14,7 +14,6 @@ In alphabetical order of includes directory: AdoDb-Date 0.21 Modified BSD License Yes Date convertion ArtiChow 1.07 Public Domain Yes Graphics CKEditor 3.6.1 GPL or LGPL 2.1 or MPL 1.1 Yes Editor WYSIWYG -FCKEditor 2.6.6 LGPL 2.1 or Mozilla PL 1.0 Yes Editor WYSIWYG FPDI 1.4.1 Apache Software License 2.0 No GPL3 only PDF templates management jQuery 1.6.1 GPL and MIT Licence Yes JS library jQuery UI 1.8.14 GPL and MIT Licence Yes JS library plugin UI @@ -26,7 +25,6 @@ jQuery jNotify 1.1.00 Apache Software License 2.0 No GPL3 only JS library p jQuery Mobile 1.0b1 GPL and MIT Licence Yes JS library for smartphone (not used) jQuery Tiptip 1.3 GPL and MIT Licence Yes JS library for tooltips JSGantt 1.2 BSD Licence Yes JS library (to build Gantt reports) -MagPieRss 0.72 GPL 2.0 Yes Load RSS NuSoap 0.9.5 LGPL 2.1 Yes Interfaces with third tools OdtPHP 1.0.1 GPL 2.0 Yes Library to build/edit ODT files Php-barcode 0.3pl1 GPL 2.0 Yes Bar code generation diff --git a/build/deb/copyright b/build/deb/copyright index 7a7e752fe43..2b6c9d28006 100644 --- a/build/deb/copyright +++ b/build/deb/copyright @@ -54,13 +54,7 @@ License: Public Domain Files: htdocs/includes/ckeditor/* License: GPL-2+ -Files: htdocs/includes/efc_xfss/* -License: GPL-2+ - -Files: htdocs/includes/fckeditor/* -License: GPL-2+ - -Files: htdocs/includes/magpierss/* +Files: htdocs/includes/fpdi/* License: GPL-2+ Files: htdocs/includes/jquery/* @@ -72,7 +66,7 @@ License: Public Domain Files: htdocs/includes/jsgantt/* License: GPL-2+ -Files: htdocs/includes/phpwrite_excel/* +Files: htdocs/includes/phpexcel/* License: LGPL 2.1 Files: htdocs/includes/odtphp/* diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec index 431e2b50094..0a69fdfc205 100755 --- a/build/rpm/dolibarr_fedora.spec +++ b/build/rpm/dolibarr_fedora.spec @@ -119,6 +119,7 @@ cui hai bisogno ed essere facile da usare. %_datadir/dolibarr/scripts/* %defattr(-, root, root, 0755) +%exclude %_datadir/dolibarr/htdocs/langs/*/*.lang %doc %_datadir/doc/dolibarr %dir %_datadir/dolibarr/build/rpm %dir %_datadir/dolibarr/build/tgz