From 62bd21d36a7a79ff0dc8395eb7c73c8c0914e5eb Mon Sep 17 00:00:00 2001
From: Jan Kaluza <jkaluza@redhat.com>
Date: Sep 21 2017 07:14:24 +0000
Subject: New version 0.0.5


---

diff --git a/.gitignore b/.gitignore
index 56057b4..217ab7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /odcs-0.0.3.tar.gz
 /odcs-0.0.4.tar.gz
+/odcs-0.0.5.tar.gz
diff --git a/odcs-conf.patch b/odcs-conf.patch
deleted file mode 100644
index 809c18d..0000000
--- a/odcs-conf.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 17897cd..b19ce39 100644
---- a/setup.py
-+++ b/setup.py
-@@ -45,7 +45,8 @@ setup(name='odcs',
-           'console_scripts': ['odcs-upgradedb = odcs.server.manage:upgradedb [server]',
-                               'odcs-gencert = odcs.server.manage:generatelocalhostcert [server]',
-                               'odcs-frontend = odcs.server.manage:runssl [server]',
--                              'odcs.server.backend = odcs.server.manage:runbackend [server]',
-+                              'odcs-backend = odcs.server.manage:runbackend [server]',
-                               'odcs-manager = odcs.server.manage:manager_wrapper [server]'],
-       },
-+      data_files=[('/etc/odcs/', ['server/conf/config.py'])],
-       )
diff --git a/odcs-pythonldap.patch b/odcs-pythonldap.patch
index 0178ab8..e3e985f 100644
--- a/odcs-pythonldap.patch
+++ b/odcs-pythonldap.patch
@@ -1,10 +1,11 @@
-diff --git a/requirements.txt b/requirements.txt
-index ace5a03..f9d8fba 100644
+diff --git a/server/requirements.txt b/server/requirements.txt
+index 6cf07be..ed4f4d4 100644
 --- a/server/requirements.txt
 +++ b/server/requirements.txt
-@@ -17,4 +17,4 @@ Flask-SQLAlchemy
+@@ -19,5 +19,5 @@ Flask-Script
  Flask-Login
  requests
  jinja2
 -pyldap
 +python-ldap
+ defusedxml
diff --git a/odcs.spec b/odcs.spec
index 5423546..54b6a2e 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -2,7 +2,7 @@
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:       odcs
-Version:    0.0.4
+Version:    0.0.5
 Release:    1%{?dist}
 Summary:    The On Demand Compose Service
 
@@ -18,7 +18,6 @@ Source1:    odcs-backend.service
 Patch0:     odcs-pythonldap.patch
 # Fedora related configuration for ODCS.
 Patch1:     odcs-fedora-conf.patch
-Patch2:     odcs-conf.patch
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 # In EL7 we need flask which needs python-itsdangerous which comes from
@@ -57,6 +56,7 @@ BuildRequires:    python-sqlalchemy
 BuildRequires:    python-futures
 BuildRequires:    python-flask
 BuildRequires:    systemd-python
+BuildRequires:    python-defusedxml
 %else
 BuildRequires:    python2-setuptools
 BuildRequires:    python2-flask-sqlalchemy
@@ -68,6 +68,7 @@ BuildRequires:    python2-six
 BuildRequires:    python2-futures
 BuildRequires:    python2-flask
 BuildRequires:    python2-systemd
+BuildRequires:    python2-defusedxml
 
 %if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7)
 BuildRequires:    pyOpenSSL
@@ -107,6 +108,7 @@ Requires:    pyOpenSSL
 Requires:    python-sqlalchemy
 Requires:    python-futures
 Requires:    python-flask
+Requires:    python-defusedxml
 
 Requires:    systemd-python
 %else
@@ -117,6 +119,7 @@ Requires:    python2-systemd
 Requires:    python2-six
 Requires:    python2-futures
 Requires:    python2-flask
+Requires:    python2-defusedxml
 
 %if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7)
 Requires:    pyOpenSSL
@@ -167,7 +170,6 @@ Client library for sending requests to On Demand Compose Service (ODCS).
 
 %patch0 -p1 -b .pyldap
 %patch1 -p1
-%patch2 -p1
 
 
 %build
@@ -222,12 +224,14 @@ exit 0
 %{python2_sitelib}/odcs/__init__.py*
 %{python2_sitelib}/odcs/common/
 %{python2_sitelib}/odcs-%{version}-py%{pyver}.egg-info/
+%exclude %{python2_sitelib}/odcs/__pycache__
 
 %files -n python2-odcs-client
 %doc README.md
 %license LICENSE
 %dir %{python2_sitelib}/odcs/
 %{python2_sitelib}/odcs/client/
+%exclude %{python2_sitelib}/odcs/__pycache__
 
 %files
 %doc README.md
@@ -240,9 +244,13 @@ exit 0
 %dir %{_sysconfdir}/odcs
 %config(noreplace) %{_sysconfdir}/odcs/config.py
 %exclude %{_sysconfdir}/odcs/*.py[co]
+%exclude %{python2_sitelib}/odcs/__pycache__
 
 
 %changelog
+* Thu Sep 21 2017 Jan Kaluza <jkaluza@redhat.com> - 0.0.5-1
+- new version
+
 * Thu Aug 10 2017 Jan Kaluza <jkaluza@redhat.com> - 0.0.4-1
 - new version
 
diff --git a/sources b/sources
index 6cd809e..9b5ff91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (odcs-0.0.4.tar.gz) = a01c328b927cf87cb56a091685349c79c19a2420538110328c34438b045afc44177c140617c5e86f746b3e2c59a1f8a73ab129a5fca4d9502f1bd034a058f133
+SHA512 (odcs-0.0.5.tar.gz) = b7cc6dd968b021ba2fd24093681754120580308843f97dd58377dc459895998581da86e928722b694ee931ad21254109df8d53d6cce24c6cdcbbdb90625a60e9