diff --git a/.gitignore b/.gitignore index e5900dd..8cec86b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ /module-build-service-1.3.23.tar.gz /module-build-service-1.3.24.tar.gz /module-build-service-1.3.25.tar.gz +/module-build-service-1.3.26.tar.gz +/module-build-service-1.3.27.tar.gz diff --git a/module-build-service.spec b/module-build-service.spec index 9de8915..f7c4bde 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,152 +1,144 @@ -Name: module-build-service -Version: 1.3.25 -Release: 8%{?dist} -Summary: The Module Build Service for Modularity +Name: module-build-service +Version: 1.3.27 +Release: 1%{?dist} +Summary: The Module Build Service for Modularity -Group: Development/Tools -License: MIT -URL: https://pagure.io/fm-orchestrator -Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz +Group: Development/Tools +License: MIT +URL: https://pagure.io/fm-orchestrator +Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{version}.tar.gz %if 0%{?rhel} && 0%{?rhel} <= 7 Patch0: mbs-no-mbsbuild.patch %endif -Patch1: mbs-empty-server-name.patch -Patch2: mbs-cg-upload.patch -Patch3: mbs-macros-repo-regen.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 +ExclusiveArch: %{ix86} x86_64 %else -BuildArch: noarch +BuildArch: noarch %endif -BuildRequires: python2-devel - -BuildRequires: python2-mock -BuildRequires: python-vcrpy -BuildRequires: fedmsg -BuildRequires: git -BuildRequires: help2man -BuildRequires: kobo -BuildRequires: kobo-rpmlib - -BuildRequires: m2crypto -BuildRequires: mock -BuildRequires: python2-pdc-client -BuildRequires: python-fedora -BuildRequires: python-flask-script -BuildRequires: python-httplib2 -BuildRequires: python-m2ext -BuildRequires: python-munch -BuildRequires: python-six -BuildRequires: python2-funcsigs -BuildRequires: python2-modulemd >= 1.1.0 -BuildRequires: rpm-build -BuildRequires: python-qpid -BuildRequires: python-openidc-client -BuildRequires: python-urlgrabber - -%if (0%{?fedora} && 0%{?fedora} <= 26) || (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: koji -%else -BuildRequires: python2-koji -%endif +BuildRequires: python2-devel + +BuildRequires: python2-mock +BuildRequires: python-vcrpy +BuildRequires: fedmsg +BuildRequires: git +BuildRequires: help2man +BuildRequires: kobo +BuildRequires: kobo-rpmlib + +BuildRequires: m2crypto +BuildRequires: mock +BuildRequires: python2-pdc-client +BuildRequires: python2-dogpile-cache +BuildRequires: python-fedora +BuildRequires: python-flask-script +BuildRequires: python-httplib2 +BuildRequires: python-m2ext +BuildRequires: python-munch +BuildRequires: python2-funcsigs +BuildRequires: python2-modulemd >= 1.1.0 +BuildRequires: rpm-build +BuildRequires: python-qpid +BuildRequires: python-openidc-client +BuildRequires: python-urlgrabber + +BuildRequires: python2-koji %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-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 %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 - -%if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7) -BuildRequires: pyOpenSSL -BuildRequires: python-sqlalchemy +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 + +%if 0%{?fedora} && 0%{?fedora} <= 25 +BuildRequires: pyOpenSSL +BuildRequires: python-sqlalchemy %else -BuildRequires: python2-pyOpenSSL -BuildRequires: python2-sqlalchemy -%endif - +BuildRequires: python2-pyOpenSSL +BuildRequires: python2-sqlalchemy %endif -BuildRequires: systemd -%{?systemd_requires} - -%if (0%{?fedora} && 0%{?fedora} <= 26) || (0%{?rhel} && 0%{?rhel} <= 7) -Requires: koji -%else -Requires: python2-koji %endif -Requires: systemd -Requires: fedmsg -Requires: fedmsg-hub -Requires: fedpkg -Requires: git -Requires: kobo -Requires: kobo-rpmlib -Requires: m2crypto -Requires: mock -Requires: python2-pdc-client -Requires: pyOpenSSL -Requires: python-fedora -Requires: python-flask-script -Requires: python-httplib2 -Requires: python-m2ext -Requires: python-munch -Requires: python2-funcsigs -Requires: python2-modulemd >= 1.1.0 -Requires: rpm-build -Requires: python-qpid -Requires: python-openidc-client -Requires: python-urlgrabber +BuildRequires: systemd + +Requires: systemd +Requires: fedmsg +Requires: fedmsg-hub +Requires: fedpkg +Requires: git +Requires: kobo +Requires: kobo-rpmlib +Requires: m2crypto +Requires: mock +Requires: python2-pdc-client +Requires: pyOpenSSL +Requires: python-fedora +Requires: python-flask-script +Requires: python-httplib2 +Requires: python-m2ext +Requires: python-munch +Requires: python2-funcsigs +Requires: python2-modulemd >= 1.1.0 +Requires: rpm-build +Requires: python-qpid +Requires: python-openidc-client +Requires: python-urlgrabber +Requires: python2-dogpile-cache + +Requires: python2-koji + +# https://bugzilla.redhat.com/show_bug.cgi?id=1466792 +Requires: mock-scm %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: systemd-python +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: 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-tabulate - -%if (0%{?fedora} && 0%{?fedora} <= 25) || (0%{?rhel} && 0%{?rhel} <= 7) -Requires: pyOpenSSL -Requires: python-sqlalchemy +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-tabulate + +%if 0%{?fedora} && 0%{?fedora} <= 25 +Requires: pyOpenSSL +Requires: python-sqlalchemy %else -Requires: python2-pyOpenSSL -Requires: python2-sqlalchemy +Requires: python2-pyOpenSSL +Requires: python2-sqlalchemy %endif %endif @@ -173,10 +165,6 @@ for a number of tasks: %patch0 -p1 %endif -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 - # Simply remove an old .pyc file that was included in one release. rm -f module_build_service/scheduler/consumer.pyc # And this weird sqlite file that made it in... @@ -195,14 +183,14 @@ mkdir -p %{buildroot}/%{_mandir}/man1 for command in mbs-manager mbs-frontend mbs-gencert mbs-upgradedb ; do MBS_CONFIG_FILE=conf/config.py %{buildroot}/%{_bindir}/$command --help || true MBS_CONFIG_FILE=conf/config.py help2man -N --version-string=%{version} \ - %{buildroot}/%{_bindir}/$command > \ - %{buildroot}/%{_mandir}/man1/$command.1 + %{buildroot}/%{_bindir}/$command > \ + %{buildroot}/%{_mandir}/man1/$command.1 done -# Still failing https://pagure.io/fm-orchestrator/issue/381 -#%check -#nosetests-2.7 -v +%check +# https://pagure.io/fm-orchestrator/issue/664 +#nosetests-%{python2_version} -v %files @@ -224,8 +212,26 @@ done %exclude %{python2_sitelib}/conf/ %exclude %{python2_sitelib}/tests/ - %changelog +* Tue Sep 12 2017 Ralph Bean - 1.3.27-1 +- new version + +* Tue Sep 05 2017 Igor Gnatenko - 1.3.26-5 +- Really apply patches + +* Sun Sep 03 2017 Igor Gnatenko - 1.3.26-4 +- Backport patches to fix skiptests behavior +- Cleanups / Fixes in spec + +* Fri Aug 18 2017 Jan Kaluza - 1.3.26-3 +- add missing dependency on python2-dogpile-cache + +* Thu Aug 17 2017 Jan Kaluza - 1.3.26-2 +- fix mbs-build issue with trailing slash in REST API url + +* Thu Aug 17 2017 Jan Kaluza - 1.3.26-1 +- new version + * Mon Aug 07 2017 Jan Kaluza - 1.3.25-8 - do not wait for kojira when generating module-build-macros repository @@ -235,11 +241,13 @@ done * Fri Aug 04 2017 Jan Kaluza - 1.3.25-6 - fix tagging components when all of them are reused -* Fri Aug 04 2017 Jan Kaluza - 1.3.25-5 +* Fri Aug 04 2017 Ralph Bean - 1.3.25-5 - upload content generator logs to Koji +- Require mock-scm for local builds. -* Tue Jul 18 2017 Jan Kaluza - 1.3.25-4 +* Wed Jul 26 2017 Fedora Release Engineering - 1.3.25-4 - fix bug during build caused by not set SERVER_NAME in configuration file +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild * Mon Jul 17 2017 Jan Kaluza - 1.3.25-3 - fix typo in spec file diff --git a/sources b/sources index 5b05427..d94ae8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.25.tar.gz) = d04810cdff3f3476eeadd5339543a7000f562652a518733b4b05bd292c4acebc444a8fe73ce306605fbfc03b219d782bbb04d3a9c27dad9ed44b91b216867b8e +SHA512 (module-build-service-1.3.27.tar.gz) = 1c447fc999559d2ac4d9b4526e91fa19989943d59822ef543e269350ceaf71e5bf5d00247982f48d0eee04d1f92865426966a2eea7f4734df7ea050c432ac364