#6 Clean up the spec file
Merged a year ago by mprahl. Opened a year ago by mprahl.

file modified
+13 -23

@@ -5,7 +5,7 @@ 

  

  Name:           module-build-service

  Version:        2.11.1

- Release:        1%{?dist}

+ Release:        2%{?dist}

  Summary:        The Module Build Service for Modularity

  

  Group:          Development/Tools

@@ -24,8 +24,6 @@ 

  BuildRequires:  python3-devel

  BuildRequires:  python3-setuptools

  BuildRequires:  python3-m2crypto

- BuildRequires:  python3-mock

- BuildRequires:  python3-pdc-client

  BuildRequires:  python3-flask-script

  BuildRequires:  python3-munch

  BuildRequires:  python3-funcsigs

@@ -47,14 +45,13 @@ 

  BuildRequires:  python3-kobo

  BuildRequires:  python3-kobo-rpmlib

  BuildRequires:  python3-fedmsg

+ BuildRequires:  python3-pungi

  

  %else

  

  BuildRequires:  python2-devel

  

- BuildRequires:  python2-mock

  BuildRequires:  m2crypto

- BuildRequires:  python2-pdc-client

  BuildRequires:  python-flask-script

  BuildRequires:  python-m2ext

  BuildRequires:  python-munch

@@ -66,12 +63,12 @@ 

  BuildRequires:  python-enum34

  BuildRequires:  python2-koji

  BuildRequires:  python2-fedmsg

+ BuildRequires:  python2-pungi

  

  %if 0%{?rhel} && 0%{?rhel} <= 7

  BuildRequires:  python-setuptools

  BuildRequires:  python-flask-sqlalchemy

  BuildRequires:  python-flask-migrate

- BuildRequires:  python-mock

  BuildRequires:  python-six

  BuildRequires:  pyOpenSSL

  BuildRequires:  python-sqlalchemy

@@ -85,7 +82,6 @@ 

  BuildRequires:  python2-setuptools

  BuildRequires:  python2-flask-sqlalchemy

  BuildRequires:  python2-flask-migrate

- BuildRequires:  python2-mock

  BuildRequires:  python2-six

  BuildRequires:  python2-futures

  BuildRequires:  python2-flask

@@ -109,7 +105,6 @@ 

  BuildRequires:  rpm-build

  

  %if 0%{?with_python3}

- Requires:       python3-pdc-client

  Requires:       python3-flask-script

  Requires:       python3-munch

  Requires:       python3-funcsigs

@@ -120,9 +115,8 @@ 

  Requires:       python3-koji

  Requires:       python3-flask-sqlalchemy

  Requires:       python3-flask-migrate

- Requires:       python3-mock

  Requires:       python3-six

- 

+ Requires:       python3-pungi

  Requires:       python3-sqlalchemy

  Requires:       python3-moksha-hub

  Requires:       python3-m2crypto

@@ -134,7 +128,6 @@ 

  Requires:       python3-pyOpenSSL

  Requires:       python3-fedmsg

  %else

- Requires:       python2-pdc-client

  Requires:       python-flask-script

  Requires:       python-munch

  Requires:       python2-funcsigs

@@ -145,11 +138,11 @@ 

  Requires:       python2-solv

  Requires:       python2-koji

  Requires:       python2-fedmsg

+ Requires:       python2-pungi

  

  %if 0%{?rhel} && 0%{?rhel} <= 7

  Requires:       python-flask-sqlalchemy

  Requires:       python-flask-migrate

- Requires:       python-mock

  Requires:       python-six

  Requires:       python-sqlalchemy

  Requires:       python-moksha-hub

@@ -161,7 +154,6 @@ 

  %else

  Requires:       python2-flask-sqlalchemy

  Requires:       python2-flask-migrate

- Requires:       python2-mock

  Requires:       python2-six

  Requires:       python2-futures

  Requires:       python2-flask

@@ -228,13 +220,14 @@ 

  %py2_install

  %endif

  

- %if 0%{?with_epel}

- 

  %if 0%{?with_python3}

  export PYTHONPATH=%{buildroot}%{python3_sitelib}

  %else

  export PYTHONPATH=%{buildroot}%{python2_sitelib}

  %endif

+ 

+ # The version of kobo required is not in RHEL/EPEL, so these commands will fail

+ %if 0%{?fedora}

  mkdir -p %{buildroot}/%{_mandir}/man1

  for command in mbs-manager mbs-frontend mbs-upgradedb ; do

  MBS_CONFIG_FILE=conf/config.py %{buildroot}/%{_bindir}/$command --help || true

@@ -244,12 +237,6 @@ 

  done

  %endif

  

- 

- %check

- # https://pagure.io/fm-orchestrator/issue/664

- #nosetests-%{python2_version} -v

- 

- 

  %files

  %doc README.rst

  %license LICENSE

@@ -281,12 +268,15 @@ 

  %exclude %{python2_sitelib}/tests/

  %endif

  

- %if 0%{?with_epel}

+ %if 0%{?fedora}

  %{_mandir}/man1/mbs-*.1*

  %endif

  

- 

  %changelog

+ * Wed Jan 09 2019 mprahl <mprahl@redhat.com> - 2.11.1-2

+ - Add python-pungi as a dependency for Fedora builds

+ - Remove pdc-client as a dependency

+ 

  * Wed Dec 19 2018 mprahl <mprahl@redhat.com> - 2.11.1-1

  - new version

  

This addresses RHBZ#1664741.

This PR is separated into four commits:

  • Remove the commented out check section since it's not functional
  • Remove some leftover with_epel macros
  • Remove pdc-client as a dependency
  • Add python-pungi as a dependency

Metadata Update from @mprahl:
- Request assigned

a year ago

Pull-Request has been merged by mprahl

a year ago
Metadata