diff --git a/.gitignore b/.gitignore index bc6ce7d..0bd654f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /module-build-service-1.0.2.tar.gz +/module-build-service-1.1.0.tar.gz diff --git a/module-build-service.spec b/module-build-service.spec index d16faf0..aa28222 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service -Version: 1.0.2 -Release: 4%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: The Module Build Service for Modularity Group: Development/Tools @@ -13,6 +13,7 @@ BuildArch: noarch BuildRequires: python2-devel BuildRequires: python2-mock +BuildRequires: python-vcrpy BuildRequires: fedmsg BuildRequires: git BuildRequires: help2man @@ -70,10 +71,7 @@ Requires: python-m2ext Requires: python-munch Requires: python-six Requires: python-sqlalchemy -Requires: python2-mock Requires: python2-modulemd -Requires: python3-mock -Requires: python3-modulemd Requires: rpm-build %if 0%{?rhel} && 0%{?rhel} <= 7 @@ -108,6 +106,12 @@ rm -f module_build_service/scheduler/consumer.pyc # And this weird sqlite file that made it in... rm -f module_build_service/.mbs_local_build.db +# Remove erroneous requirement +# https://pagure.io/fm-orchestrator/pull-request/288 +sed -i '/vcrpy/d' requirements.txt +# https://pagure.io/fm-orchestrator/pull-request/289 +sed -i '/systemd-python/d' requirements.txt + %build %py2_build @@ -120,8 +124,10 @@ help2man -N --version-string=%{version} %{buildroot}/%{_bindir}/$command > \ %{buildroot}/%{_mandir}/man1/$command.1 done -%check -nosetests-2 +# Disable the test suite for now. +# https://pagure.io/fm-orchestrator/pull-request/290 +#%check +#nosetests-2 -v %files %doc README.rst @@ -143,6 +149,9 @@ nosetests-2 %changelog +* Tue Jan 17 2017 Ralph Bean - 1.1.0-1 +- new version + * Wed Jan 11 2017 Ralph Bean - 1.0.2-4 - Conditionalize some deps for EPEL7. diff --git a/sources b/sources index e14a966..6d49dda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.0.2.tar.gz) = bc7a52b9fe998783a5bb7c70fe3df4e26b28a33294979422002daf7080dd85e204f8a3e45dafd1d3148608d9676786edfa43fb2a74a87b52916832468ce8c4e9 +SHA512 (module-build-service-1.1.0.tar.gz) = 93e592ac654ff5613faa2b6189e089d7ebbfe20e0c3ee914b1082fa51be3381e388a0a0094e75d2731a4585374fc8118ff250fcd11cf91f5a6e3613cf7d13529