diff --git a/.gitignore b/.gitignore index ec5a18d..a3b59e7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /odcs-0.0.7.tar.gz /odcs-0.0.8.tar.gz /odcs-0.1.0.tar.gz +/odcs-0.1.1.tar.gz diff --git a/odcs-pythonldap.patch b/odcs-pythonldap.patch index e3e985f..00a1c49 100644 --- a/odcs-pythonldap.patch +++ b/odcs-pythonldap.patch @@ -1,11 +1,12 @@ diff --git a/server/requirements.txt b/server/requirements.txt -index 6cf07be..ed4f4d4 100644 +index f5cbd97..599b1c7 100644 --- a/server/requirements.txt +++ b/server/requirements.txt -@@ -19,5 +19,5 @@ Flask-Script +@@ -19,6 +19,6 @@ Flask-Script Flask-Login requests jinja2 -pyldap +python-ldap defusedxml + productmd diff --git a/odcs.spec b/odcs.spec index 096b207..bb0bd00 100644 --- a/odcs.spec +++ b/odcs.spec @@ -1,8 +1,9 @@ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")} +%global debug_package %{nil} Name: odcs -Version: 0.1.0 +Version: 0.1.1 Release: 2%{?dist} Summary: The On Demand Compose Service @@ -18,7 +19,6 @@ Source1: odcs-backend.service Patch0: odcs-pythonldap.patch # Fedora related configuration for ODCS. Patch1: odcs-fedora-conf.patch -Patch2: odcs-pulp-http.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -38,12 +38,14 @@ BuildRequires: python-flask-login BuildRequires: python-httplib2 BuildRequires: python-m2ext BuildRequires: python-munch +BuildRequires: python-productmd BuildRequires: python2-funcsigs BuildRequires: python2-modulemd >= 1.1.0 BuildRequires: python-qpid BuildRequires: python2-openidc-client BuildRequires: python-ldap +BuildRequires: python-koji %if 0%{?rhel} && 0%{?rhel} <= 7 BuildRequires: python-setuptools @@ -99,6 +101,8 @@ Requires: python2-modulemd >= 1.1.0 Requires: python-qpid Requires: python2-openidc-client Requires: python-ldap +Requires: python-productmd +Requires: python-koji %if 0%{?rhel} && 0%{?rhel} <= 7 Requires: python-flask-sqlalchemy @@ -171,7 +175,6 @@ Client library for sending requests to On Demand Compose Service (ODCS). %patch0 -p1 -b .pyldap %patch1 -p1 -%patch2 -p1 %build @@ -245,11 +248,15 @@ exit 0 %{_datadir}/odcs %dir %{_sysconfdir}/odcs %config(noreplace) %{_sysconfdir}/odcs/config.py +%config(noreplace) %{_sysconfdir}/odcs/pungi.conf %exclude %{_sysconfdir}/odcs/*.py[co] %exclude %{python2_sitelib}/odcs/__pycache__ %changelog +* Mon Oct 30 2017 Jan Kaluza - 0.1.1-1 +- updated to new version 0.1.1. + * Thu Oct 12 2017 Jan Kaluza - 0.1.0-2 - use http instead of https for pulp .repo file diff --git a/sources b/sources index 1b04b5f..384562f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (odcs-0.1.0.tar.gz) = 88ff3f5f36d78196fcf53e6fbd3d33e6d8de42f9d60ab9540e853c148494bd3e72c95a782e8267b8ca4d2f233f1e50b5a19fd0c83b061470e0d7fc663a621d49 +SHA512 (odcs-0.1.1.tar.gz) = 008e0462d9fd66a186b60d1e4a6694bacac4ace1a168eff58240bb20268f0f680c0ed67b3df6a9eb2732764a59541f3cd9a79972e44f4b160434b4d723529a77