diff --git a/.gitignore b/.gitignore index 0f99bdb..7144fd3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /odcs-0.2.6.2.tar.gz /odcs-0.2.7.tar.gz /odcs-0.2.23.tar.gz +/odcs-0.2.36.tar.gz diff --git a/odcs-default-help.patch b/odcs-default-help.patch deleted file mode 100644 index 5878609..0000000 --- a/odcs-default-help.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/client/contrib/odcs b/client/contrib/odcs -old mode 100755 -new mode 100644 -index ae047b4..3b7b99c ---- a/client/contrib/odcs -+++ b/client/contrib/odcs -@@ -150,6 +150,10 @@ get_parser.add_argument( - - args = parser.parse_args() - -+if not hasattr(args, "command"): -+ parser.print_help() -+ sys.exit(0) -+ - if args.server is None: - odcs_url = env_config[args.infra][args.env]['server_url'] - else: diff --git a/odcs-pythonldap.patch b/odcs-pythonldap.patch index 3598ea2..d4c070e 100644 --- a/odcs-pythonldap.patch +++ b/odcs-pythonldap.patch @@ -1,14 +1,14 @@ diff --git a/server/requirements.txt b/server/requirements.txt -index a982904..cbe5569 100644 +index c6539fe..847708e 100644 --- a/server/requirements.txt +++ b/server/requirements.txt -@@ -20,8 +20,7 @@ Flask-Script - Flask-Login - requests - jinja2 --pyldap -+python-ldap +@@ -23,6 +23,5 @@ jinja2 defusedxml productmd pygobject -koji +-pyldap +-celery +\ No newline at end of file ++python-ldap ++celery diff --git a/odcs.spec b/odcs.spec index 34cc087..3207d9d 100644 --- a/odcs.spec +++ b/odcs.spec @@ -3,8 +3,8 @@ %global _python_bytecompile_extra 1 Name: odcs -Version: 0.2.23 -Release: 5%{?dist} +Version: 0.2.36 +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-default-help.patch BuildArch: noarch @@ -123,7 +122,6 @@ sed -i '/futures/d' server/requirements.txt %patch0 -p1 -b .pyldap %patch1 -p1 -%patch2 -p1 %build %py3_build @@ -209,6 +207,9 @@ nosetests-%{python3_version} -v %changelog +* Thu Oct 17 2019 Jan Kaluza - 0.2.36-1 +- new version + * Thu Oct 03 2019 Miro HronĨok - 0.2.23-5 - Rebuilt for Python 3.8.0rc1 (#1748018) diff --git a/sources b/sources index d37991c..b62bc4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (odcs-0.2.23.tar.gz) = 78e84bf2b92b5c4f62c8aba41ec1c3762a11957f02586bdcc96cf6cdde98d1ffcadfd613792c9a5924e719f78e10f4ead4da8e51d969eaca74c7b6d7137b0012 +SHA512 (odcs-0.2.36.tar.gz) = 29edd17bb81e5ba71bca90ce77c973d285f7fa79f087669df607f53094a15d66db74a4b3b316456329a1dede02eee1982b51a5086dad0b184798a5916ab1be19