diff --git a/.gitignore b/.gitignore index 29618f9..e5900dd 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /module-build-service-1.3.22.tar.gz /module-build-service-1.3.23.tar.gz /module-build-service-1.3.24.tar.gz +/module-build-service-1.3.25.tar.gz diff --git a/module-build-service.spec b/module-build-service.spec index 6a6a9c1..251bf52 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,6 +1,6 @@ Name: module-build-service -Version: 1.3.24 -Release: 2%{?dist} +Version: 1.3.25 +Release: 1%{?dist} Summary: The Module Build Service for Modularity @@ -11,7 +11,6 @@ Source0: https://files.pythonhosted.org/packages/source/m/%{name}/%{name}-%{vers %if 0%{?rhel} && 0%{?rhel} <= 7 Patch0: mbs-no-mbsbuild.patch %endif -Patch1: mbs-koji-find-untagged.patch %if 0%{?rhel} && 0%{?rhel} <= 7 # In EL7 we need flask which needs python-itsdangerous which comes from @@ -34,35 +33,51 @@ BuildRequires: koji BuildRequires: m2crypto BuildRequires: mock BuildRequires: python2-pdc-client -BuildRequires: pyOpenSSL BuildRequires: python-fedora -BuildRequires: python-flask BuildRequires: python-flask-script BuildRequires: python-httplib2 BuildRequires: python-m2ext BuildRequires: python-munch BuildRequires: python-six -BuildRequires: python-sqlalchemy BuildRequires: python2-funcsigs BuildRequires: python2-modulemd >= 1.1.0 BuildRequires: rpm-build BuildRequires: python-qpid -BuildRequires: python-futures BuildRequires: python-openidc-client +BuildRequires: python-urlgrabber %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-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-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 +%else +BuildRequires: python2-pyOpenSSL +BuildRequires: python2-sqlalchemy +%endif + %endif BuildRequires: systemd @@ -79,32 +94,46 @@ Requires: koji Requires: m2crypto Requires: mock Requires: pdc-client -Requires: pyOpenSSL Requires: python-fedora -Requires: python-flask Requires: python-flask-script Requires: python-httplib2 Requires: python-m2ext Requires: python-munch -Requires: python-six -Requires: python-sqlalchemy Requires: python2-funcsigs Requires: python2-modulemd >= 1.1.0 Requires: rpm-build Requires: python-qpid -Requires: python-futures Requires: python-openidc-client +Requires: python-urlgrabber %if 0%{?rhel} && 0%{?rhel} <= 7 -Requires: python-flask-sqlalchemy -Requires: python-flask-migrate -Requires: python-mock +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 %else -Requires: python2-flask-sqlalchemy -Requires: python2-flask-migrate -Requires: python2-mock -Requires: python2-tabulate -Requires: python2-systemd +Requires: python2-pyOpenSSL +Requires: python2-sqlalchemy +%endif + %endif @@ -129,8 +158,6 @@ for a number of tasks: %patch0 -p1 %endif -%patch1 -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... @@ -147,7 +174,7 @@ rm -f module_build_service/.mbs_local_build.db export PYTHONPATH=%{buildroot}%{python2_sitelib} mkdir -p %{buildroot}/%{_mandir}/man1 for command in mbs-manager mbs-frontend mbs-gencert mbs-upgradedb ; do -MBS_CONFIG_FILE=conf/config.py help2man || true +MBS_CONFIG_FILE=conf/config.py %{buildroot}/%{_bindir}/$command || true MBS_CONFIG_FILE=conf/config.py help2man -N --version-string=%{version} \ %{buildroot}/%{_bindir}/$command > \ %{buildroot}/%{_mandir}/man1/$command.1 @@ -180,10 +207,13 @@ done %changelog -* Tue Jul 27 2017 Jan Kaluza - 1.3.24-2 +* Mon Jul 17 2017 Jan Kaluza - 1.3.25-1 +- new version + +* Tue Jun 27 2017 Jan Kaluza - 1.3.24-2 - Fix the pdc-client dependency -* Tue Jul 27 2017 Jan Kaluza - 1.3.24-1 +* Tue Jun 27 2017 Jan Kaluza - 1.3.24-1 - new version * Mon Jun 05 2017 Jan Kaluza - 1.3.23-5 diff --git a/sources b/sources index d7e1943..5b05427 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (module-build-service-1.3.24.tar.gz) = 4fb3a1d6235893071be7a04c74941fabf1067fc8ada235756154f60ca145a668929a5528d0c0a1f00682407eb58ddbc080a954bd5ce1ff48a7950fe95ed3e44f +SHA512 (module-build-service-1.3.25.tar.gz) = d04810cdff3f3476eeadd5339543a7000f562652a518733b4b05bd292c4acebc444a8fe73ce306605fbfc03b219d782bbb04d3a9c27dad9ed44b91b216867b8e