From 6731707e43e1483a16bcabedf032b804df97feb874f7a1ebd13afa02b6011063 Mon Sep 17 00:00:00 2001
From: Axel Braun <axel.braun@gmx.de>
Date: Mon, 11 Jun 2018 09:20:40 +0000
Subject: [PATCH] Update to trytond Version 4.2.12 - Bugfix Release

OBS-URL: https://build.opensuse.org/package/show/Application:ERP:GNUHealth:Factory/trytond?expand=0&rev=20
---
 trytond-4.2.11.tar.gz |  3 ---
 trytond-4.2.12.tar.gz |  3 +++
 trytond.changes       |  5 +++++
 trytond.spec          | 22 +++++++++++-----------
 4 files changed, 19 insertions(+), 14 deletions(-)
 delete mode 100644 trytond-4.2.11.tar.gz
 create mode 100644 trytond-4.2.12.tar.gz

diff --git a/trytond-4.2.11.tar.gz b/trytond-4.2.11.tar.gz
deleted file mode 100644
index 36c1723..0000000
--- a/trytond-4.2.11.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1aff7772037e2898886091511049c5e83e4e45891db23c97cd1b3f912414b8c4
-size 588359
diff --git a/trytond-4.2.12.tar.gz b/trytond-4.2.12.tar.gz
new file mode 100644
index 0000000..4b51a5b
--- /dev/null
+++ b/trytond-4.2.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dac5d5e29fd7d2e7a34ec0e4688c485162765f5abb5ae8d39b66c12d2fac38e9
+size 588443
diff --git a/trytond.changes b/trytond.changes
index 09b2788..340e3f1 100644
--- a/trytond.changes
+++ b/trytond.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 11 09:20:09 UTC 2018 - axel.braun@gmx.de
+
+- Version 4.2.12 - Bugfix Release
+
 -------------------------------------------------------------------
 Fri Jun  8 10:41:08 UTC 2018 - axel.braun@gmx.de
 
diff --git a/trytond.spec b/trytond.spec
index babd6aa..d498f8d 100644
--- a/trytond.spec
+++ b/trytond.spec
@@ -20,7 +20,7 @@
 %define majorver 4.2
 %define base_name tryton
 Name:           trytond
-Version:        %{majorver}.11
+Version:        %{majorver}.12
 Release:        0
 
 Summary:        An Enterprise Resource Planning (ERP) system
@@ -48,30 +48,30 @@ BuildRequires:  python3-setuptools
 #BuildRequires:  python3-simplejson
 BuildRequires:  python3-wrapt
 BuildRequires:  systemd-rpm-macros
+Requires:       libreoffice-pyuno
 Requires:       postgresql96-server
 Requires:       python3-Genshi
-Requires:       python3-lxml
-Requires:       python3-psycopg2
-Requires:       libreoffice-pyuno
 Requires:       python3-Levenshtein
-Requires:       python3-dateutil
-Requires:       python3-polib
-Requires:       python3-python-sql
-Requires:       python3-relatorio
-Requires:       unoconv
 Requires:       python3-Sphinx
 Requires:       python3-Werkzeug
 Requires:       python3-bcrypt
+Requires:       python3-dateutil
+Requires:       python3-lxml
 Requires:       python3-mock
+Requires:       python3-polib
+Requires:       python3-psycopg2
+Requires:       python3-python-sql
+Requires:       python3-relatorio
 Requires:       python3-simpleeval
 Requires:       python3-wrapt
+Requires:       unoconv
 Requires(pre): 	/usr/sbin/groupadd
 Requires(pre): 	/usr/sbin/useradd
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
-Conflicts: postgresql10-server
-Conflicts: postgresql10
+Conflicts:      postgresql10-server
+Conflicts:      postgresql10
 
 %{?systemd_requires}