From 73bd16676e2a94fa4b108b770798e63a08830b1b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sep 03 2017 11:32:41 +0000 Subject: make tab/space mess consistent Signed-off-by: Igor Gnatenko --- diff --git a/module-build-service.spec b/module-build-service.spec index ca717c5..3b27a39 100644 --- a/module-build-service.spec +++ b/module-build-service.spec @@ -1,155 +1,155 @@ -Name: module-build-service -Version: 1.3.26 -Release: 3%{?dist} -Summary: The Module Build Service for Modularity +Name: module-build-service +Version: 1.3.26 +Release: 3%{?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 +Patch0: mbs-no-mbsbuild.patch %endif -Patch1: mbs-build-trailing-slash.patch +Patch1: mbs-build-trailing-slash.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: python2-dogpile-cache -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 +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: 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 +BuildRequires: koji %else -BuildRequires: python2-koji +BuildRequires: python2-koji %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-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 +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: pyOpenSSL +BuildRequires: python-sqlalchemy %else -BuildRequires: python2-pyOpenSSL -BuildRequires: python2-sqlalchemy +BuildRequires: python2-pyOpenSSL +BuildRequires: python2-sqlalchemy %endif %endif -BuildRequires: systemd +BuildRequires: systemd %{?systemd_requires} %if (0%{?fedora} && 0%{?fedora} <= 26) || (0%{?rhel} && 0%{?rhel} <= 7) -Requires: koji +Requires: koji %else -Requires: python2-koji +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 -Requires: python2-dogpile-cache +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 # https://bugzilla.redhat.com/show_bug.cgi?id=1466792 -Requires: mock-scm +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 +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: pyOpenSSL +Requires: python-sqlalchemy %else -Requires: python2-pyOpenSSL -Requires: python2-sqlalchemy +Requires: python2-pyOpenSSL +Requires: python2-sqlalchemy %endif %endif @@ -196,8 +196,8 @@ 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