summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD35
-rw-r--r--apache.conf.example4
-rw-r--r--dolibarr.install6
-rw-r--r--nginx.conf.example2
6 files changed, 32 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 673bacd79106..b8d1becc63b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = dolibarr
- pkgdesc = ERP/CRM for small and medium companies
- pkgver = 13.0.2
+ pkgdesc = Dolibarr ERP CRM: modern software package to manage your company
+ pkgver = 17.0.0
pkgrel = 1
- url = http://www.dolibarr.org/
+ url = https://dolibarr.org/
install = dolibarr.install
arch = any
license = GPL3
@@ -10,13 +10,12 @@ pkgbase = dolibarr
optdepends = php-tcpdf: pdf export
options = !strip
options = emptydirs
- backup = etc/webapps/dolibarr/conf.php
- source = http://downloads.sourceforge.net/project/dolibarr/Dolibarr%20ERP-CRM/13.0.2/dolibarr-13.0.2.tgz
+ backup = etc/dolibarr/conf.php
+ source = http://downloads.sourceforge.net/project/dolibarr/Dolibarr%20ERP-CRM/17.0.0/dolibarr-17.0.0.tgz
source = nginx.conf.example
source = apache.conf.example
- md5sums = 94955641ce3cb72c0111244c181b8c3a
- md5sums = 4b36b8318edad5fe10fd9ef5ade92ed3
- md5sums = d468572a7aa663d958c302b3e15147f1
+ b2sums = 06be067676cae8a2372f5082e10d9742372ce3fdc494e0b132de9872d70be4dc69ffdd8197930fee30a994774dd8d9f73a3c3666d41a0d6a4a5ae438fc05320b
+ b2sums = a9735e32fb447b99f688b6121e7abe39133a2cda3de58dba32201b3688b1f8ce90ebbf676bafe2f877b5203ff61bb468657a6b8685829edb9a46d192d82edacc
+ b2sums = 243dcd12c4f02974d6775972e32c2fbe9648ed0844a1ab5253ba9954e76d29401f08a465116db7b2a56d4f7f78223690b382588b34341c608174188a8950278f
pkgname = dolibarr
-
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..aa1ec1ea0618
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.tgz
diff --git a/PKGBUILD b/PKGBUILD
index 72b6395d8ae7..03135e1f75a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
-# Maintainer: Charles Brunet <charles AT cbrunet DOT net>
-# Contributor: Okki <okki666@free.fr>
+# Maintainer: HLFH <gaspard@dhautefeuille.eu>
pkgname=dolibarr
-pkgver=13.0.2
+pkgver=17.0.0
pkgrel=1
-pkgdesc="ERP/CRM for small and medium companies"
+pkgdesc="Dolibarr ERP CRM: modern software package to manage your company"
arch=('any')
-url="http://www.dolibarr.org/"
+url="https://dolibarr.org/"
license=('GPL3')
depends=('php')
optdepends=('mariadb-clients: MariaDB backend')
@@ -15,38 +14,38 @@ optdepends=('php-intl: Languages support')
optdepends=('php-xsl: xlsx export')
optdepends=('php-tcpdf: pdf export')
options=('!strip' 'emptydirs')
-backup=("etc/webapps/$pkgname/conf.php")
+backup=("etc/$pkgname/conf.php")
install=dolibarr.install
source=("http://downloads.sourceforge.net/project/$pkgname/Dolibarr%20ERP-CRM/$pkgver/$pkgname-$pkgver.tgz"
nginx.conf.example
apache.conf.example)
-md5sums=('94955641ce3cb72c0111244c181b8c3a'
- '4b36b8318edad5fe10fd9ef5ade92ed3'
- 'd468572a7aa663d958c302b3e15147f1')
+b2sums=('06be067676cae8a2372f5082e10d9742372ce3fdc494e0b132de9872d70be4dc69ffdd8197930fee30a994774dd8d9f73a3c3666d41a0d6a4a5ae438fc05320b'
+ 'a9735e32fb447b99f688b6121e7abe39133a2cda3de58dba32201b3688b1f8ce90ebbf676bafe2f877b5203ff61bb468657a6b8685829edb9a46d192d82edacc'
+ '243dcd12c4f02974d6775972e32c2fbe9648ed0844a1ab5253ba9954e76d29401f08a465116db7b2a56d4f7f78223690b382588b34341c608174188a8950278f')
prepare() {
sed -e "3,5d" \
-e "s|example for ||g" \
- -e "s|main_document_root=''|main_document_root='/usr/share/webapps/$pkgname/htdocs'|g" \
+ -e "s|main_document_root=''|main_document_root='/usr/share/$pkgname/htdocs'|g" \
-e "s|main_data_root=''|main_data_root='/var/lib/$pkgname'|g" \
"$pkgname-$pkgver/htdocs/conf/conf.php.example" >"$pkgname-$pkgver/htdocs/conf/conf.php"
}
package() {
- mkdir -p "$pkgdir/usr/share/webapps/$pkgname"
- mkdir -p "$pkgdir/etc/webapps/$pkgname"
+ mkdir -p "$pkgdir/usr/share/$pkgname"
+ mkdir -p "$pkgdir/etc/$pkgname"
mkdir -p "$pkgdir/var/lib/$pkgname"
mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
mkdir -p "$pkgdir/usr/share/doc/$pkgname"
- cp *.conf.example "$pkgdir/etc/webapps/$pkgname/"
+ cp *.conf.example "$pkgdir/etc/$pkgname/"
cd "$pkgname-$pkgver"
- cp -ra htdocs "$pkgdir/usr/share/webapps/$pkgname/"
- cp -ra scripts "$pkgdir/usr/share/webapps/$pkgname/"
+ cp -ra htdocs "$pkgdir/usr/share/$pkgname/"
+ cp -ra scripts "$pkgdir/usr/share/$pkgname/"
cp COPYING "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
cp -ra doc/* "$pkgdir/usr/share/doc/$pkgname/"
- cp htdocs/conf/conf.php "$pkgdir/etc/webapps/$pkgname/conf.php"
- rm "$pkgdir/usr/share/webapps/$pkgname/htdocs/conf/conf.php"
- ln -s /etc/webapps/$pkgname/conf.php "$pkgdir/usr/share/webapps/$pkgname/htdocs/conf/conf.php"
+ cp htdocs/conf/conf.php "$pkgdir/etc/$pkgname/conf.php"
+ rm "$pkgdir/usr/share/$pkgname/htdocs/conf/conf.php"
+ ln -s /etc/$pkgname/conf.php "$pkgdir/usr/share/$pkgname/htdocs/conf/conf.php"
}
diff --git a/apache.conf.example b/apache.conf.example
index 2d0675eb821d..4111e43b925b 100644
--- a/apache.conf.example
+++ b/apache.conf.example
@@ -1,5 +1,5 @@
-Alias /dolibarr "/usr/share/webapps/dolibarr"
-<Directory "/usr/share/webapps/dolibarr/htdocs">
+Alias /dolibarr "/usr/share/dolibarr"
+<Directory "/usr/share/dolibarr/htdocs">
DirectoryIndex index.html index.php
AllowOverride All
Options FollowSymlinks
diff --git a/dolibarr.install b/dolibarr.install
index b6ad8b1f63b3..69f97a8a04d6 100644
--- a/dolibarr.install
+++ b/dolibarr.install
@@ -1,7 +1,7 @@
post_install() {
chown -R http:http var/lib/dolibarr
- chown http:http etc/webapps/dolibarr/conf.php
- echo 'Please configure your webserver. Example files are provided in /etc/webapps/dolibarr'
+ chown http:http etc/dolibarr/conf.php
+ echo 'Please configure your webserver. Example files are provided in /etc/dolibarr'
echo 'It could be necessary to add /var/lib/dolibarr/ to open_basedir in php.ini'
echo 'Finish installation by pointing your webbrowser to http://dolibarr.localdomain/install'
}
@@ -17,7 +17,7 @@ post_upgrade() {
fi
fi
rm var/lib/dolibarr/install.lock
- cd usr/share/webapps/dolibarr/htdocs/install
+ cd usr/share/dolibarr/htdocs/install
echo 'upgrade.php' $old $new
php upgrade.php $old $new > /dev/null
echo 'upgrade2.php' $old $new
diff --git a/nginx.conf.example b/nginx.conf.example
index 6031fcdbed7d..0509afb29b5b 100644
--- a/nginx.conf.example
+++ b/nginx.conf.example
@@ -1,7 +1,7 @@
server {
server_name dolibarr.localdomain;
- root /usr/share/webapps/dolibarr/htdocs;
+ root /usr/share/dolibarr/htdocs;
index index.php;
location ~ [^/]\.php(/|$) {