From 592e25799e3381e263b9e69fd500d8bdbd1cb2a30ffa21ce833bfc292fd53e39 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 18 Aug 2017 13:06:00 +0000
Subject: [PATCH] Accepting request 517418 from Application:ERP:Tryton:Factory

version 4.2.6 plus typos removed

OBS-URL: https://build.opensuse.org/request/show/517418
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trytond?expand=0&rev=11
---
 tryton-server.README.SUSE | 2 +-
 trytond-4.2.5.tar.gz      | 3 ---
 trytond-4.2.6.tar.gz      | 3 +++
 trytond.changes           | 7 +++++++
 trytond.conf              | 6 +++---
 trytond.conf.example      | 2 +-
 trytond.spec              | 2 +-
 7 files changed, 16 insertions(+), 9 deletions(-)
 delete mode 100644 trytond-4.2.5.tar.gz
 create mode 100644 trytond-4.2.6.tar.gz

diff --git a/tryton-server.README.SUSE b/tryton-server.README.SUSE
index d3044d6..07bbccd 100644
--- a/tryton-server.README.SUSE
+++ b/tryton-server.README.SUSE
@@ -221,7 +221,7 @@ Now you need to run grunt. make sure it is run from the locally installed versio
 
 Last but not least, edit /etc/tryton/trytond.conf
 In the section [web], set the path:
-    root = /usr/lib/node-modules/tryton-sao
+    root = /srv/tryton-sao/package
 
 Now restart trytond.
     
diff --git a/trytond-4.2.5.tar.gz b/trytond-4.2.5.tar.gz
deleted file mode 100644
index a951555..0000000
--- a/trytond-4.2.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:de60711cb046eee59f0363e96977ca54bc8f119833339be8f000ad978fe685a2
-size 585937
diff --git a/trytond-4.2.6.tar.gz b/trytond-4.2.6.tar.gz
new file mode 100644
index 0000000..bae3f06
--- /dev/null
+++ b/trytond-4.2.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:686fbf3b95d491b7c2e70546bce5476b4b0fa76dd0805f679317a8060e97299d
+size 586007
diff --git a/trytond.changes b/trytond.changes
index a77600b..778e87c 100644
--- a/trytond.changes
+++ b/trytond.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 10 20:04:47 UTC 2017 - axel.braun@gmx.de
+
+- Version 4.2.6
+  bugfix release
+  typo in trytond.conf removed
+
 -------------------------------------------------------------------
 Mon Jul 10 14:07:26 UTC 2017 - axel.braun@gmx.de
 
diff --git a/trytond.conf b/trytond.conf
index 5b84c50..6b5a505 100644
--- a/trytond.conf
+++ b/trytond.conf
@@ -20,14 +20,14 @@
 
 uri = postgresql:///
 
-#
 #
 # PostgreSQL via TCP/IP
 # (e.g. connecting to a PostgreSQL database running on a remote machine or
 # by means of md5 authentication. Needs PostgreSQL to be configured to accept
 # those connections (pg_hba.conf).)
+#
 #uri = postgresql://tryton:tryton@localhost:5432/
-
+#
 # The path to the directory where the Tryton Server stores files.
 # The server must have write permissions to this directory.
 # (Internal default: /var/lib/trytond)
@@ -135,4 +135,4 @@ listen = localhost:8080
 
 [web]
 # Path for the web-frontend
-#root = /usr/lib/node-modules/tryton-sao
+#root = /usr/lib/node_modules/tryton-sao
diff --git a/trytond.conf.example b/trytond.conf.example
index bd96e7d..5b9dcf5 100644
--- a/trytond.conf.example
+++ b/trytond.conf.example
@@ -132,4 +132,4 @@ super_pwd = jkUbZGvFNeugk
 
 [web]
 # Path for the web-frontend
-#root = /usr/lib/node-modules/tryton-sao
+#root = /usr/lib/node_modules/tryton-sao
diff --git a/trytond.spec b/trytond.spec
index aa648e1..edfefd7 100644
--- a/trytond.spec
+++ b/trytond.spec
@@ -20,7 +20,7 @@
 %define majorver 4.2
 %define base_name tryton
 Name:           trytond
-Version:        %{majorver}.5
+Version:        %{majorver}.6
 Release:        0
 
 Summary:        An Enterprise Resource Planning (ERP) system