The package rpms/odcs.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/odcs.git/commit/?id=ad1c0a9635b91....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit 208b27cba835489690f95eb222ef6a55959c7934
Merge: c88995d 78b27f1
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 12:05:21 2019 +0100
Merge branch 'master' into f28
diff --cc .gitignore
index a0bdb55,0f99bdb..ec46d02
--- a/.gitignore
+++ b/.gitignore
@@@ -20,4 -20,4 +20,5 @@@
/odcs-0.2.6.1.tar.gz
/odcs-0.2.6.2.tar.gz
/odcs-0.2.7.tar.gz
+/odcs-0.2.11.tar.gz
+ /odcs-0.2.23.tar.gz
diff --cc odcs.spec
index 1e3df6d,61cd111..79b6ed5
--- a/odcs.spec
+++ b/odcs.spec
@@@ -45,42 -37,6 +37,7 @@@ BuildRequires: python3-fedor
BuildRequires: python3-productmd
BuildRequires: python3-funcsigs
BuildRequires: python3-openidc-client
- BuildRequires: python3-moksha-hub
-
- %else
-
- BuildRequires: python2-devel
- BuildRequires: python2-devel
- BuildRequires: python2-pdc-client
- BuildRequires: python2-fedora
- BuildRequires: python2-productmd
- BuildRequires: python2-funcsigs
- BuildRequires: python2-openidc-client
- %endif
-
-
- %if 0%{?rhel} && 0%{?rhel} <= 7
- BuildRequires: python-setuptools
- BuildRequires: python-flask-sqlalchemy
- BuildRequires: python-flask-migrate
- BuildRequires: python-nose
- BuildRequires: python-mock
- BuildRequires: python-six
- BuildRequires: pyOpenSSL
- BuildRequires: python-sqlalchemy
- BuildRequires: python-futures
- BuildRequires: python-flask
- BuildRequires: systemd-python
- BuildRequires: python-defusedxml
- BuildRequires: koji
- BuildRequires: python-httplib2
- BuildRequires: python-qpid
- BuildRequires: pyOpenSSL
- BuildRequires: python-sqlalchemy
- BuildRequires: python-ldap
- BuildRequires: python-gobject-base
- %else
- %if 0%{?with_python3}
++BuildRequires: python3-psycopg2
BuildRequires: python3-setuptools
BuildRequires: python3-flask-sqlalchemy
BuildRequires: python3-flask-migrate
@@@ -152,98 -67,20 +68,31 @@@ Requires(pre): shadow-util
Requires: fedmsg-hub
Requires: systemd
Requires: pungi
+ Requires: python3-pdc-client
+ Requires: python3-fedora
+ Requires: python3-funcsigs
+ Requires: python3-openidc-client
+ Requires: python3-productmd
Requires: hardlink
- Requires: libmodulemd
+ Requires: libmodulemd1
Requires: gobject-introspection
- Requires: python-gobject-base
-
- %if 0%{?rhel} && 0%{?rhel} <= 7
- Requires: python-flask-sqlalchemy
- Requires: python-flask-migrate
- Requires: python-mock
- Requires: python-six
- Requires: pyOpenSSL
- Requires: python-sqlalchemy
- Requires: python-futures
- Requires: python-flask
- Requires: python-defusedxml
- Requires: koji
- Requires: python-httplib2
- Requires: python-qpid
- Requires: pyOpenSSL
- Requires: python-sqlalchemy
-
- Requires: systemd-python
- Requires: python2-odcs-common = %{version}-%{release}
- %else
-
- %if 0%{?with_python3}
-
-Requires: python3-moksha-hub
-Requires: python3-psutil
-Requires: python3-fedmsg
+Requires: python3-flask-sqlalchemy
+Requires: python3-flask-migrate
+Requires: python3-mock
+Requires: python3-systemd
+Requires: python3-six
+Requires: python3-flask
+Requires: python3-defusedxml
+Requires: python3-koji
+Requires: python3-httplib2
+Requires: python3-pyOpenSSL
+Requires: python3-sqlalchemy
Requires: python3-flufl-lock
-
Requires: python3-odcs-common = %{version}-%{release}
+Requires: python3-moksha-hub
+Requires: python3-fedmsg
- Requires: python3-pdc-client
- Requires: python3-fedora
- Requires: python3-funcsigs
- Requires: python3-openidc-client
- Requires: python3-productmd
+Requires: python3-psycopg2
-
- %else
-
- Requires: python2-flask-sqlalchemy
- Requires: python2-flask-migrate
- Requires: python2-mock
- Requires: python2-systemd
- Requires: python2-six
- Requires: python2-futures
- Requires: python2-flask
- Requires: python2-defusedxml
- Requires: python2-koji
- Requires: python2-httplib2
- Requires: python2-qpid
- Requires: python2-pyOpenSSL
- Requires: python2-sqlalchemy
- Requires: python2-flufl-lock
- Requires: python2-pdc-client
- Requires: python2-fedora
- Requires: python2-funcsigs
- Requires: python2-openidc-client
- Requires: python2-productmd
- Requires: python2-odcs-common = %{version}-%{release}
- %endif
- %endif
-
- %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
- Requires: python-flask-script
- Requires: python-flask-login
- Requires: python-ldap
- Requires: python-munch
- %else
- %if 0%{?with_python3}
- Requires: python3-flask-script
- Requires: python3-flask-login
- Requires: python3-pyldap
- Requires: python3-munch
- %else
- Requires: python2-flask-script
- Requires: python2-flask-login
- Requires: python2-ldap
- Requires: python2-munch
- %endif
- %endif
++Requires: python3-psutil
%description
@@@ -251,7 -88,6 +100,7 @@@ The On Demand Compose Service (ODCS) cr
tool and manages their lifetime. The composes can be requested by external
services or users using the REST API provided by Flask frontend.
- %if 0%{?with_python3}
++
%package -n python3-odcs-common
Summary: ODCS subpackage providing code shared between server and client.
%{?python_provide:%python_provide python3-odcs-client}
@@@ -273,47 -109,10 +122,11 @@@ Requires: python3-odcs-common = %
%description -n python3-odcs-client
Client library for sending requests to On Demand Compose Service (ODCS).
- %else
-
- %package -n python2-odcs-common
- Summary: ODCS subpackage providing code shared between server and client.
- %{?python_provide:%python_provide python2-odcs-client}
-
- Requires: python2-six
-
- %description -n python2-odcs-common
- ODCS subpackage providing code shared between server and client.
-
- %package -n python2-odcs-client
- Summary: ODCS client module
- %{?python_provide:%python_provide python2-odcs-client}
-
- Requires: python2-six
-
- %if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
- Requires: python-requests
- Requires: python-requests-kerberos
- %else
- Requires: python2-requests
- Requires: python2-requests-kerberos
- %endif
-
- Requires: python2-odcs-common = %{version}-%{release}
-
- %description -n python2-odcs-client
- Client library for sending requests to On Demand Compose Service (ODCS).
-
- %endif
+
%package -n odcs-client
Summary: ODCS command line client
- %if 0%{?with_python3}
Requires: python3-openidc-client
Requires: python3-odcs-client = %{version}-%{release}
- %else
- Requires: python2-openidc-client
- Requires: python2-odcs-client = %{version}-%{release}
- %endif
%description -n odcs-client
Command line client for sending requests to ODCS.
@@@ -412,26 -194,6 +208,7 @@@ nosetests-%{python3_version} -
%{python3_sitelib}/odcs/client/
%exclude %{python3_sitelib}/odcs/__pycache__
- %else
-
- %files -n python2-odcs-common
- %doc README.md
- %license LICENSE
- %dir %{python2_sitelib}/odcs/
- %{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__
-
- %endif
+
%files
%doc README.md
%license LICENSE
commit 78b27f1f55260a4b938969fa623c926d22bbe8ff
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 09:38:30 2019 +0100
add missing python3-flufl-lock requirement.
diff --git a/odcs.spec b/odcs.spec
index fe23480..61cd111 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -59,6 +59,7 @@ BuildRequires: python3-munch
BuildRequires: python3-moksha-hub
BuildRequires: python3-psutil
BuildRequires: python3-fedmsg
+BuildRequires: python3-flufl-lock
%{?systemd_requires}
@@ -77,6 +78,7 @@ Requires: gobject-introspection
Requires: python3-moksha-hub
Requires: python3-psutil
Requires: python3-fedmsg
+Requires: python3-flufl-lock
Requires: python3-odcs-common = %{version}-%{release}
commit 447f5f5a49eff49cb14b4ead0af16d1617f8c2eb
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 09:29:35 2019 +0100
add missing python3-fedmsg requirement
diff --git a/odcs.spec b/odcs.spec
index 602debd..fe23480 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -58,6 +58,7 @@ BuildRequires: python3-flask-login
BuildRequires: python3-munch
BuildRequires: python3-moksha-hub
BuildRequires: python3-psutil
+BuildRequires: python3-fedmsg
%{?systemd_requires}
@@ -75,6 +76,7 @@ Requires: libmodulemd1
Requires: gobject-introspection
Requires: python3-moksha-hub
Requires: python3-psutil
+Requires: python3-fedmsg
Requires: python3-odcs-common = %{version}-%{release}
commit 6069afa03b8dda9b3743eeffda32312be00c43f2
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 09:24:01 2019 +0100
add missing python3-psutil requirement
diff --git a/odcs.spec b/odcs.spec
index 9e2ae42..602debd 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -57,6 +57,7 @@ BuildRequires: python3-flask-script
BuildRequires: python3-flask-login
BuildRequires: python3-munch
BuildRequires: python3-moksha-hub
+BuildRequires: python3-psutil
%{?systemd_requires}
@@ -73,6 +74,7 @@ Requires: hardlink
Requires: libmodulemd1
Requires: gobject-introspection
Requires: python3-moksha-hub
+Requires: python3-psutil
Requires: python3-odcs-common = %{version}-%{release}
commit e41e374751e4bff4022c539accefa5c3874d0a74
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 09:16:53 2019 +0100
Add missing python3-moksha-hub requirement.
diff --git a/odcs.spec b/odcs.spec
index f4a6b25..9e2ae42 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -56,6 +56,7 @@ BuildRequires: python3-gobject-base
BuildRequires: python3-flask-script
BuildRequires: python3-flask-login
BuildRequires: python3-munch
+BuildRequires: python3-moksha-hub
%{?systemd_requires}
@@ -63,14 +64,15 @@ Requires(pre): shadow-utils
Requires: fedmsg-hub
Requires: systemd
Requires: pungi
-Requires: python2-pdc-client
-Requires: python2-fedora
-Requires: python2-funcsigs
-Requires: python2-openidc-client
-Requires: python2-productmd
+Requires: python3-pdc-client
+Requires: python3-fedora
+Requires: python3-funcsigs
+Requires: python3-openidc-client
+Requires: python3-productmd
Requires: hardlink
Requires: libmodulemd1
Requires: gobject-introspection
+Requires: python3-moksha-hub
Requires: python3-odcs-common = %{version}-%{release}
commit ad1c0a9635b917b7b144508d125842fbb9603e2e
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 08:51:54 2019 +0100
Build only with python3
diff --git a/odcs.spec b/odcs.spec
index 1eb999e..f4a6b25 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -2,10 +2,6 @@
#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
%global _python_bytecompile_extra 1
-%if 0%{?fedora}
-%global with_python3 1
-%endif
-
%{!?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}
@@ -28,83 +24,19 @@ Patch0: odcs-pythonldap.patch
Patch1: odcs-fedora-conf.patch
Patch2: odcs-default-help.patch
-%if 0%{?rhel} && 0%{?rhel} <= 7
-# In EL7 we need flask which needs python-itsdangerous which comes from
-# rhel7-extras which is only available on x86_64 for now.
-ExclusiveArch: %{ix86} x86_64
-%else
BuildArch: noarch
-%endif
-
-BuildRequires: python2-devel
BuildRequires: fedmsg-hub
BuildRequires: help2man
-
-BuildRequires: libmodulemd
+BuildRequires: libmodulemd1
BuildRequires: gobject-introspection
-
BuildRequires: systemd
-
-BuildRequires: python2-devel
-BuildRequires: python2-pdc-client
-BuildRequires: python2-fedora
-BuildRequires: python2-productmd
-BuildRequires: python2-funcsigs
-BuildRequires: python2-modulemd >= 1.1.0
-BuildRequires: python2-openidc-client
-
-%if 0%{?with_python3}
BuildRequires: python3-devel
BuildRequires: python3-pdc-client
BuildRequires: python3-fedora
BuildRequires: python3-productmd
BuildRequires: python3-funcsigs
-BuildRequires: python3-modulemd >= 1.1.0
BuildRequires: python3-openidc-client
-%endif
-
-
-%if 0%{?rhel} && 0%{?rhel} <= 7
-BuildRequires: python-setuptools
-BuildRequires: python-flask-sqlalchemy
-BuildRequires: python-flask-migrate
-BuildRequires: python-nose
-BuildRequires: python-mock
-BuildRequires: python-six
-BuildRequires: pyOpenSSL
-BuildRequires: python-sqlalchemy
-BuildRequires: python-futures
-BuildRequires: python-flask
-BuildRequires: systemd-python
-BuildRequires: python-defusedxml
-BuildRequires: koji
-BuildRequires: python-httplib2
-BuildRequires: python-qpid
-BuildRequires: pyOpenSSL
-BuildRequires: python-sqlalchemy
-BuildRequires: python-ldap
-BuildRequires: python-gobject-base
-%else
-BuildRequires: python2-setuptools
-BuildRequires: python2-flask-sqlalchemy
-BuildRequires: python2-flask-migrate
-BuildRequires: python2-nose
-BuildRequires: python2-mock
-BuildRequires: python2-tabulate
-BuildRequires: python2-six
-BuildRequires: python2-futures
-BuildRequires: python2-flask
-BuildRequires: python2-systemd
-BuildRequires: python2-defusedxml
-BuildRequires: python2-koji
-BuildRequires: python2-httplib2
-BuildRequires: python2-qpid
-BuildRequires: python2-pyOpenSSL
-BuildRequires: python2-sqlalchemy
-BuildRequires: python2-ldap
-BuildRequires: python2-gobject-base
-%if 0%{?with_python3}
BuildRequires: python3-setuptools
BuildRequires: python3-flask-sqlalchemy
BuildRequires: python3-flask-migrate
@@ -121,24 +53,9 @@ BuildRequires: python3-pyOpenSSL
BuildRequires: python3-sqlalchemy
BuildRequires: python3-ldap
BuildRequires: python3-gobject-base
-%endif
-%endif
-
-%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
-BuildRequires: python-flask-script
-BuildRequires: python-flask-login
-BuildRequires: python-munch
-%else
-BuildRequires: python2-flask-script
-BuildRequires: python2-flask-login
-BuildRequires: python2-munch
-%if 0%{?with_python3}
BuildRequires: python3-flask-script
BuildRequires: python3-flask-login
BuildRequires: python3-munch
-%endif
-%endif
-
%{?systemd_requires}
@@ -149,61 +66,13 @@ Requires: pungi
Requires: python2-pdc-client
Requires: python2-fedora
Requires: python2-funcsigs
-Requires: python2-modulemd >= 1.1.0
Requires: python2-openidc-client
Requires: python2-productmd
Requires: hardlink
-Requires: libmodulemd
+Requires: libmodulemd1
Requires: gobject-introspection
-%if 0%{?rhel} && 0%{?rhel} <= 7
-Requires: python-flask-sqlalchemy
-Requires: python-flask-migrate
-Requires: python-mock
-Requires: python-six
-Requires: pyOpenSSL
-Requires: python-sqlalchemy
-Requires: python-futures
-Requires: python-flask
-Requires: python-defusedxml
-Requires: koji
-Requires: python-httplib2
-Requires: python-qpid
-Requires: pyOpenSSL
-Requires: python-sqlalchemy
-Requires: python-gobject-base
-
-Requires: systemd-python
-%else
-Requires: python2-flask-sqlalchemy
-Requires: python2-flask-migrate
-Requires: python2-mock
-Requires: python2-systemd
-Requires: python2-six
-Requires: python2-futures
-Requires: python2-flask
-Requires: python2-defusedxml
-Requires: python2-koji
-Requires: python2-httplib2
-Requires: python2-qpid
-Requires: python2-pyOpenSSL
-Requires: python2-sqlalchemy
-Requires: python2-gobject-base
-%endif
-
-%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
-Requires: python-flask-script
-Requires: python-flask-login
-Requires: python-ldap
-Requires: python-munch
-%else
-Requires: python2-flask-script
-Requires: python2-flask-login
-Requires: python2-ldap
-Requires: python2-munch
-%endif
-
-Requires: python2-odcs-common = %{version}-%{release}
+Requires: python3-odcs-common = %{version}-%{release}
%description
@@ -211,35 +80,6 @@ The On Demand Compose Service (ODCS) creates temporary composes using
Pungi
tool and manages their lifetime. The composes can be requested by external
services or users using the REST API provided by Flask frontend.
-%package -n python2-odcs-common
-Summary: ODCS subpackage providing code shared between server and client.
-%{?python_provide:%python_provide python2-odcs-client}
-
-Requires: python2-six
-
-%description -n python2-odcs-common
-ODCS subpackage providing code shared between server and client.
-
-%package -n python2-odcs-client
-Summary: ODCS client module
-%{?python_provide:%python_provide python2-odcs-client}
-
-Requires: python2-six
-
-%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
-Requires: python-requests
-Requires: python-requests-kerberos
-%else
-Requires: python2-requests
-Requires: python2-requests-kerberos
-%endif
-
-Requires: python2-odcs-common = %{version}-%{release}
-
-%description -n python2-odcs-client
-Client library for sending requests to On Demand Compose Service (ODCS).
-
-%if 0%{?with_python3}
%package -n python3-odcs-common
Summary: ODCS subpackage providing code shared between server and client.
%{?python_provide:%python_provide python3-odcs-client}
@@ -260,17 +100,11 @@ Requires: python3-odcs-common = %{version}-%{release}
%description -n python3-odcs-client
Client library for sending requests to On Demand Compose Service (ODCS).
-%endif
%package -n odcs-client
Summary: ODCS command line client
-%if 0%{?with_python3}
Requires: python3-openidc-client
Requires: python3-odcs-client = %{version}-%{release}
-%else
-Requires: python2-openidc-client
-Requires: python2-odcs-client = %{version}-%{release}
-%endif
%description -n odcs-client
Command line client for sending requests to ODCS.
@@ -279,27 +113,22 @@ Command line client for sending requests to ODCS.
%prep
%setup -q
-%if 0%{?with_python3}
sed -i '/futures/d' common/requirements.txt
sed -i '/futures/d' client/requirements.txt
sed -i '/futures/d' server/requirements.txt
-%endif
%patch0 -p1 -b .pyldap
%patch1 -p1
%patch2 -p1
%build
-%py2_build
-%if 0%{?with_python3}
%py3_build
-%endif
%install
-%py2_install
+%py3_install
-export PYTHONPATH=%{buildroot}%{python2_sitelib}
+export PYTHONPATH=%{buildroot}%{python3_sitelib}
mkdir -p %{buildroot}%{_mandir}/man1
for command in odcs-manager odcs-frontend odcs-gencert odcs-upgradedb ; do
export ODCS_CONFIG_FILE=server/conf/config.py
@@ -316,12 +145,6 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/
install -d -m 0755 %{buildroot}%{_datadir}/odcs
install -p -m 0644 server/contrib/odcs.wsgi %{buildroot}%{_datadir}/odcs
-%if 0%{?with_python3}
-# Prepare the python3 bits, but remove the server portion. We're just shipping
-# the client as py3 for now.
-%py3_install
-rm -rf %{buildroot}%{python3_sitelib}/odcs/server/
-%endif
%pre
getent group odcs >/dev/null || groupadd -r odcs
@@ -340,34 +163,13 @@ exit 0
%systemd_postun_with_restart odcs-backend.service
%check
-nosetests-2.7 -v
-
-%if 0%{?with_python3}
nosetests-%{python3_version} -v
-%endif
%files -n odcs-client
%doc README.md
%license LICENSE
%{_bindir}/odcs
-%files -n python2-odcs-common
-%doc README.md
-%license LICENSE
-%dir %{python2_sitelib}/odcs/
-%{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__
-
-%if 0%{?with_python3}
%files -n python3-odcs-common
%doc README.md
%license LICENSE
@@ -383,13 +185,12 @@ nosetests-%{python3_version} -v
%dir %{python3_sitelib}/odcs/
%{python3_sitelib}/odcs/client/
%exclude %{python3_sitelib}/odcs/__pycache__
-%endif
%files
%doc README.md
%license LICENSE
%{_unitdir}/odcs-backend.service
-%{python2_sitelib}/odcs/server
+%{python3_sitelib}/odcs/server
%{_bindir}/odcs-*
%{_mandir}/man1/odcs-*.1*
%{_datadir}/odcs
@@ -400,7 +201,7 @@ nosetests-%{python3_version} -v
%config(noreplace) %{_sysconfdir}/odcs/runroot_koji.conf
%{_sysconfdir}/fedmsg.d/*
%exclude %{_sysconfdir}/odcs/*.py[co]
-%exclude %{python2_sitelib}/odcs/__pycache__
+%exclude %{python3_sitelib}/odcs/__pycache__
%changelog
commit 11bfb43bf7fcd6a5c0fff4aad645f3542efd9a4e
Author: Jan Kaluza <jkaluza(a)redhat.com>
Date: Fri Feb 15 08:32:59 2019 +0100
New version
diff --git a/.gitignore b/.gitignore
index eb182c2..0f99bdb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
/odcs-0.2.6.1.tar.gz
/odcs-0.2.6.2.tar.gz
/odcs-0.2.7.tar.gz
+/odcs-0.2.23.tar.gz
diff --git a/odcs-default-help.patch b/odcs-default-help.patch
new file mode 100644
index 0000000..5878609
--- /dev/null
+++ b/odcs-default-help.patch
@@ -0,0 +1,17 @@
+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 00a1c49..3598ea2 100644
--- a/odcs-pythonldap.patch
+++ b/odcs-pythonldap.patch
@@ -1,8 +1,8 @@
diff --git a/server/requirements.txt b/server/requirements.txt
-index f5cbd97..599b1c7 100644
+index a982904..cbe5569 100644
--- a/server/requirements.txt
+++ b/server/requirements.txt
-@@ -19,6 +19,6 @@ Flask-Script
+@@ -20,8 +20,7 @@ Flask-Script
Flask-Login
requests
jinja2
@@ -10,3 +10,5 @@ index f5cbd97..599b1c7 100644
+python-ldap
defusedxml
productmd
+ pygobject
+-koji
diff --git a/odcs.spec b/odcs.spec
index 888fcbe..1eb999e 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -11,8 +11,8 @@
%global debug_package %{nil}
Name: odcs
-Version: 0.2.7
-Release: 5%{?dist}
+Version: 0.2.23
+Release: 1%{?dist}
Summary: The On Demand Compose Service
@@ -26,6 +26,7 @@ Source1: odcs-backend.service
Patch0: odcs-pythonldap.patch
# Fedora related configuration for ODCS.
Patch1: odcs-fedora-conf.patch
+Patch2: odcs-default-help.patch
%if 0%{?rhel} && 0%{?rhel} <= 7
# In EL7 we need flask which needs python-itsdangerous which comes from
@@ -286,7 +287,7 @@ sed -i '/futures/d' server/requirements.txt
%patch0 -p1 -b .pyldap
%patch1 -p1
-
+%patch2 -p1
%build
%py2_build
@@ -403,6 +404,9 @@ nosetests-%{python3_version} -v
%changelog
+* Fri Feb 15 2019 Jan Kaluza <jkaluza(a)redhat.com> - 0.2.23-1
+- new version
+
* Mon Feb 04 2019 Kalev Lember <klember(a)redhat.com> - 0.2.7-5
- Update requires for python-gobject -> python2-gobject rename
diff --git a/sources b/sources
index aafec7a..d37991c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (odcs-0.2.7.tar.gz) =
90d8b1f95f2fb443e9f137d49b21316a71731c27c639220c6ab0519e711883300ac4dd23f1ae6ad3d635bb7f0055ca7705592a7cecc0446540f6c3476411e4c9
+SHA512 (odcs-0.2.23.tar.gz) =
78e84bf2b92b5c4f62c8aba41ec1c3762a11957f02586bdcc96cf6cdde98d1ffcadfd613792c9a5924e719f78e10f4ead4da8e51d969eaca74c7b6d7137b0012
commit 25c20351e433208e5e1f5be42655135e63a722dd
Author: Kalev Lember <klember(a)redhat.com>
Date: Mon Feb 4 09:58:24 2019 +0100
Update requires for python-gobject -> python2-gobject rename
diff --git a/odcs.spec b/odcs.spec
index cf9f3de..888fcbe 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -12,7 +12,7 @@
Name: odcs
Version: 0.2.7
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The On Demand Compose Service
@@ -154,7 +154,6 @@ Requires: python2-productmd
Requires: hardlink
Requires: libmodulemd
Requires: gobject-introspection
-Requires: python-gobject-base
%if 0%{?rhel} && 0%{?rhel} <= 7
Requires: python-flask-sqlalchemy
@@ -171,6 +170,7 @@ Requires: python-httplib2
Requires: python-qpid
Requires: pyOpenSSL
Requires: python-sqlalchemy
+Requires: python-gobject-base
Requires: systemd-python
%else
@@ -187,6 +187,7 @@ Requires: python2-httplib2
Requires: python2-qpid
Requires: python2-pyOpenSSL
Requires: python2-sqlalchemy
+Requires: python2-gobject-base
%endif
%if (0%{?fedora} && 0%{?fedora} <= 27) || (0%{?rhel} && 0%{?rhel}
<= 7)
@@ -402,6 +403,9 @@ nosetests-%{python3_version} -v
%changelog
+* Mon Feb 04 2019 Kalev Lember <klember(a)redhat.com> - 0.2.7-5
+- Update requires for python-gobject -> python2-gobject rename
+
* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.7-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
commit 3715cf1c3b6c4fc9373a36097c7a6af098a10919
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Feb 1 17:07:35 2019 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/odcs.spec b/odcs.spec
index 426b3db..cf9f3de 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -12,7 +12,7 @@
Name: odcs
Version: 0.2.7
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The On Demand Compose Service
@@ -402,6 +402,9 @@ nosetests-%{python3_version} -v
%changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.7-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.7-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
commit 3ce35e8af206a61d8a9d24a1d7d2f3dbbfde94be
Author: Igor Gnatenko <ignatenkobrain(a)fedoraproject.org>
Date: Mon Jan 28 20:17:59 2019 +0100
Remove obsolete Group tag
References:
https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
diff --git a/odcs.spec b/odcs.spec
index f39e5bd..426b3db 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -16,7 +16,6 @@ Release: 3%{?dist}
Summary: The On Demand Compose Service
-Group: Development/Tools
License: MIT
URL:
https://pagure.io/odcs
Source0:
https://files.pythonhosted.org/packages/source/o/%{name}/%{name}-%{versio...
commit fa8212aae1c14c456feb8dde58e2ebe525a6ec10
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Thu Nov 15 12:53:55 2018 +0100
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
diff --git a/odcs.spec b/odcs.spec
index 28319e4..f39e5bd 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -1,3 +1,7 @@
+# This package depends on automagic byte compilation
+#
https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompi...
+%global _python_bytecompile_extra 1
+
%if 0%{?fedora}
%global with_python3 1
%endif
commit a0fb87fcbd2ac1cda4c5dfac542c9af7a018ab11
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 13 14:54:44 2018 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/odcs.spec b/odcs.spec
index a5fa917..28319e4 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -8,7 +8,7 @@
Name: odcs
Version: 0.2.7
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The On Demand Compose Service
@@ -399,6 +399,9 @@ nosetests-%{python3_version} -v
%changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.7-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
* Tue Jun 26 2018 Miro Hronok <mhroncok(a)redhat.com> - 0.2.7-2
- Rebuilt for Python 3.7
commit c72ad4550537b20521614dee95fdd8b6d09abd87
Author: Miro Hronok <miro(a)hroncok.cz>
Date: Tue Jun 26 23:10:40 2018 +0200
Rebuilt for Python 3.7
diff --git a/odcs.spec b/odcs.spec
index a540c75..a5fa917 100644
--- a/odcs.spec
+++ b/odcs.spec
@@ -8,7 +8,7 @@
Name: odcs
Version: 0.2.7
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The On Demand Compose Service
@@ -399,6 +399,9 @@ nosetests-%{python3_version} -v
%changelog
+* Tue Jun 26 2018 Miro Hronok <mhroncok(a)redhat.com> - 0.2.7-2
+- Rebuilt for Python 3.7
+
* Wed Jun 20 2018 Ralph Bean <rbean(a)redhat.com> - 0.2.7-1
- new version