The package rpms/ursa-major.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/ursa-major.git/commit/?id=8c468148fd... https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=faf52892d4... https://src.fedoraproject.org/cgit/rpms/ursa-major.git/commit/?id=bd283981c2....
Change: +ExclusiveArch: %{ix86} x86_64 noarch +ExclusiveArch: noarch x86_64 +ExclusiveArch: noarch aarch64 ppc64le s390x x86_64
Thanks.
Full change: ============
commit 2aa04dfb4cd8883fb932c9f61d093d9055ef5ba3 Merge: 0cc7b8d ae1aba0 Author: Chenxiong Qi cqi@redhat.com Date: Wed Mar 27 13:05:02 2019 +0800
Merge branch 'master' into epel7
diff --cc ursa-major.spec index edd8857,c2fa2a1..a708730 --- a/ursa-major.spec +++ b/ursa-major.spec @@@ -179,6 -185,25 +185,24 @@@ py.tes
%changelog + * Wed Mar 27 2019 Chenxiong Qi cqi@redhat.com - 0.2.2-1 + - For adding tag, allow filtering on buildrequires to find out koji_tags from tag inheritance (Chenxiong Qi) + - + * Wed Mar 20 2019 Chenxiong Qi cqi@redhat.com - 0.2.1-1 + - Make setup_method/teardown_method compatible with newer version of pytest (Chenxiong Qi) + - Add missing file CHANGELOG.rst to sdist package (Chenxiong Qi) + + * Wed Mar 20 2019 Chenxiong Qi cqi@redhat.com - 0.2.0-1 + - Add tests for AddModuleHandler methods (Chenxiong Qi) + - Avoid long modulemd embedded into fake data for tests (Chenxiong Qi) + - Fixes according to review comments (Chenxiong Qi) + - Command check-config supports filtering modules on buildrequires (Chenxiong Qi) + - Command add-module supports buildrequires now (Chenxiong Qi) + - Command remove-module supports filtering modules on buildrequires (Chenxiong Qi) + - Allow passing buildrequires to MBS.get_modules_with_requires (Chenxiong Qi) + - Reword remove-module help and --tag option help text (Chenxiong Qi) + - Allow filtering on buildrequires (Chenxiong Qi) + * Mon Dec 03 2018 Qixiang Wan qwan@redhat.com - 0.1.1-4 - build can be scheduled to i386 arch, include ix86
commit 0cc7b8d41706e38aaa3e41bb046d90dbc459a0f5 Author: Qixiang Wan qwan@redhat.com Date: Mon Dec 3 15:17:09 2018 +0800
Minor update to changelog
diff --git a/ursa-major.spec b/ursa-major.spec index 76de2b8..edd8857 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -180,7 +180,7 @@ py.test
%changelog * Mon Dec 03 2018 Qixiang Wan qwan@redhat.com - 0.1.1-4 -- build can be scheduled to i386 arch, include %{ix86} +- build can be scheduled to i386 arch, include ix86
* Mon Dec 03 2018 Qixiang Wan qwan@redhat.com - 0.1.1-3 - libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
commit 8c468148fd9cc0a41e9cf6104d4a696495944130 Author: Qixiang Wan qwan@redhat.com Date: Mon Dec 3 14:51:09 2018 +0800
Include %{ix86} arch
We have 'ExclusiveArch: x86_64 noarch', but job can still be scheduled to i386 arch, include ix86 to workaround.
diff --git a/ursa-major.spec b/ursa-major.spec index c5dd470..76de2b8 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -6,7 +6,7 @@
Name: ursa-major Version: 0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools @@ -15,9 +15,10 @@ URL: https://pagure.io/ursa-major Source0: https://files.pythonhosted.org/packages/source/u/%%7Bname%7D/%%7Bname%7D-%%7...
BuildArch: noarch -# 1. libmodulemd is not available for ppc or i686 -# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only -ExclusiveArch: noarch x86_64 +# EPEL: libmodulemd is not available for ppc or i686 +# Fedora: include ix86 as build can be scheduled to i386 arch, otherwise there is +# error: Architecture is not included: i386 +ExclusiveArch: %{ix86} x86_64 noarch
BuildRequires: help2man @@ -178,8 +179,11 @@ py.test
%changelog +* Mon Dec 03 2018 Qixiang Wan qwan@redhat.com - 0.1.1-4 +- build can be scheduled to i386 arch, include %{ix86} + * Mon Dec 03 2018 Qixiang Wan qwan@redhat.com - 0.1.1-3 -- libmodulemd is missing from ppc64le buildroot, enable x86_64 only +- libmodulemd is missing from EPEL ppc64le buildroot, enable x86_64 only
* Fri Nov 16 2018 Qixiang Wan qwan@redhat.com - 0.1.1-2 - Limit build arches as libmodulemd is not available for ppc or i686
commit faf52892d4ba0f67108611400481608389b4ee00 Author: Qixiang Wan qwan@redhat.com Date: Mon Dec 3 14:09:15 2018 +0800
Limit to x86_64 build
Seeing libmodulemd is missing from ppc64le buildroot, just enable x86_64 build.
diff --git a/ursa-major.spec b/ursa-major.spec index fbc578d..c5dd470 100644 --- a/ursa-major.spec +++ b/ursa-major.spec @@ -6,7 +6,7 @@
Name: ursa-major Version: 0.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A utility for working with module's koji tags in koji's tag inheritance
Group: Development/Tools @@ -15,8 +15,9 @@ URL: https://pagure.io/ursa-major Source0: https://files.pythonhosted.org/packages/source/u/%%7Bname%7D/%%7Bname%7D-%%7...
BuildArch: noarch -# libmodulemd is not available for ppc or i686 -ExclusiveArch: noarch aarch64 ppc64le s390x x86_64 +# 1. libmodulemd is not available for ppc or i686 +# 2. seeing libmodulemd is missing from ppc64le buildroot, enable x86_64 only +ExclusiveArch: noarch x86_64
BuildRequires: help2man @@ -177,6 +178,9 @@ py.test
%changelog +* Mon Dec 03 2018 Qixiang Wan qwan@redhat.com - 0.1.1-3 +- libmodulemd is missing from ppc64le buildroot, enable x86_64 only + * Fri Nov 16 2018 Qixiang Wan qwan@redhat.com - 0.1.1-2 - Limit build arches as libmodulemd is not available for ppc or i686
commit bd283981c290894d34f20756f7530a5a136b7b18 Author: Qixiang Wan qwan@redhat.com Date: Mon Dec 3 13:47:58 2018 +0800
Initial import
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b3ec1d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/ursa-major-0.1.1.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..f552a64 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (ursa-major-0.1.1.tar.gz) = 6515eab4a9b3bdf0acb055a36bb2b76f4387cef9c4aff3f75c87555d7afa2897feb4feba1d26a588db26a1321fb473a570c876991890489a91d96f579c8ba3c2 diff --git a/ursa-major.spec b/ursa-major.spec new file mode 100644 index 0000000..fbc578d --- /dev/null +++ b/ursa-major.spec @@ -0,0 +1,184 @@ +%if 0%{?fedora} +# we have some koji hubs doesn't support Python3 with kerberos auth +# at this moment, so we build with Python2 for all platforms now +%global with_python3 0 +%endif + +Name: ursa-major +Version: 0.1.1 +Release: 2%{?dist} +Summary: A utility for working with module's koji tags in koji's tag inheritance + +Group: Development/Tools +License: MIT +URL: https://pagure.io/ursa-major +Source0: https://files.pythonhosted.org/packages/source/u/%%7Bname%7D/%%7Bname%7D-%%7... + +BuildArch: noarch +# libmodulemd is not available for ppc or i686 +ExclusiveArch: noarch aarch64 ppc64le s390x x86_64 + + +BuildRequires: help2man +BuildRequires: libmodulemd + +%if 0%{?with_python3} +BuildRequires: python3-devel +BuildRequires: python3-setuptools +BuildRequires: python3-gobject-base +BuildRequires: python3-cairo +BuildRequires: python3-koji +BuildRequires: python3-six +BuildRequires: python3-requests +BuildRequires: python3-jinja2 +BuildRequires: python3-psutil +BuildRequires: python3-pytest +BuildRequires: python3-mock +%else +BuildRequires: python2-devel +BuildRequires: python2-koji +%if 0%{?rhel} && 0%{?rhel} <= 7 +BuildRequires: python-setuptools +BuildRequires: python-gobject-base +BuildRequires: pycairo +BuildRequires: python-six +BuildRequires: python-requests +BuildRequires: python-jinja2 +BuildRequires: python-futures +BuildRequires: pytest +BuildRequires: python-mock +%else +BuildRequires: python2-setuptools +BuildRequires: python2-gobject-base +BuildRequires: python2-cairo +BuildRequires: python2-six +BuildRequires: python2-requests +BuildRequires: python2-jinja2 +BuildRequires: python2-futures +BuildRequires: python2-pytest +BuildRequires: python2-mock +%endif +%endif + +Requires: gobject-introspection +Requires: krb5-workstation +Requires: koji +Requires: libmodulemd +Requires: m2crypto + +%if 0%{?with_python3} +Requires: python3-gobject-base +Requires: python3-cairo +Requires: python3-koji +Requires: python3-six +Requires: python3-requests +Requires: python3-jinja2 +%else +Requires: python2-koji +%if 0%{?rhel} && 0%{?rhel} <= 7 +Requires: python-gobject-base +Requires: pycairo +Requires: python-six +Requires: python-requests +Requires: python-jinja2 +Requires: python-futures +%else +Requires: python2-gobject-base +Requires: python2-cairo +Requires: python2-six +Requires: python2-requests +Requires: python2-jinja2 +Requires: python2-futures +%endif +%endif + + +%description +Usra-Major can be used to edit a tag config file and update module's koji tags +in koji's tag inheritance accordingly per the configuration in tag config file. + + +%package -n ursa-major-stage +Summary: A utility for working with module's koji tags in koji's tag inheritance +Requires: %{name} = %{version}-%{release} + +%description -n ursa-major-stage +The ursa-major-stage package contains script and configurations for Ursa-Major +to talk with Fedora's stage instances (Koji, MBS). + + +%prep +%setup -q + +%if 0%{?rhel} && 0%{?rhel} <= 7 +# workaround for no egg-info +sed -i '/pycairo/d' requirements.txt +# old setuptools not support environment marker +sed -i 's/futures.*/futures/' requirements.txt +%endif + +# workaround for no egg-info +sed -i '/koji/d' requirements.txt + +%build +%if 0%{?with_python3} +%py3_build +%else +%py2_build +%endif + + +%install +%if 0%{?with_python3} +%py3_install +%else +%py2_install +%endif + +%if 0%{?with_python3} +export PYTHONPATH=%{buildroot}%{python3_sitelib} +%else +export PYTHONPATH=%{buildroot}%{python2_sitelib} +%endif +mkdir -p %{buildroot}/%{_mandir}/man1 + +help2man -N --version-string=%{version} %{buildroot}/%{_bindir}/ursa-major > %{buildroot}/%{_mandir}/man1/ursa-major.1 +for cmd in show-config check-config remove-module add-module add-tag; do + help2man -N --version-string=%{version} "%{buildroot}/%{_bindir}/ursa-major $cmd" > %{buildroot}/%{_mandir}/man1/ursa-major-${cmd}.1 +done + + +%check +%if 0%{?with_python3} +py.test-3 +%else +py.test +%endif + + +%files +%doc README.rst +%license LICENSE + +%if 0%{?with_python3} +%{python3_sitelib}/ursa_major* +%else +%{python2_sitelib}/ursa_major* +%endif + +%{_bindir}/ursa-major +%dir %{_sysconfdir}/ursa-major +%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major.conf +%doc %{_mandir}/man1/ursa-major*.1* + +%files stage +%{_bindir}/ursa-major-stage +%config(noreplace) %{_sysconfdir}/ursa-major/ursa-major-stage.conf + + +%changelog +* Fri Nov 16 2018 Qixiang Wan qwan@redhat.com - 0.1.1-2 +- Limit build arches as libmodulemd is not available for ppc or i686 + +* Fri Oct 26 2018 Qixiang Wan qwan@redhat.com - 0.1.1-1 +- Initial version of spec file