Merge pull request #522 from clebergnu/rpm_check_v2

Run unittests during the build of RPM packages [v2]

MANIFEST.in

 include README.rst
 include LICENSE
+include Makefile
+include examples/*.yaml
+recursive-include selftests *

Makefile

@@ -10,6 +10,7 @@ all:
 	@echo "make build-deb-src - Generate a source debian package"
 	@echo "make build-deb-bin - Generate a binary debian package"
 	@echo "make build-deb-all - Generate both source and binary debian packages"
+	@echo "make build-rpm-src - Generate a source RPM package (.srpm)"
 	@echo "make build-rpm-all - Generate both source and binary RPMs"
 	@echo "make man - Generate the avocado man page"
 	@echo "make check - Runs tree static check, unittests and functional tests"
@@ -40,6 +41,10 @@ build-deb-all: prepare-source
 	# build both source and binary packages
 	dpkg-buildpackage -i -I -rfakeroot
 
+build-rpm-src: source
+	rpmbuild --define '_topdir %{getenv:PWD}' \
+		 -bs avocado.spec
+
 build-rpm-all: source
 	rpmbuild --define '_topdir %{getenv:PWD}' \
 		 -ba avocado.spec

avocado.spec

 Summary: Avocado Test Framework
 Name: avocado
 Version: 0.21.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2
 Group: Development/Tools
 URL: http://avocado-framework.github.io/
 Source: avocado-%{version}.tar.gz
 BuildArch: noarch
-
-%if "%{?dist}" == ".el6"
-Requires: python, python-requests, fabric, pyliblzma, libvirt-python, pystache, PyYAML, python-argparse, python-unittest2, python-logutils, python-importlib
-BuildRequires: python2-devel, python-docutils, PyYAML, python-logutils
+Requires: python, python-requests, fabric, pyliblzma, libvirt-python, pystache
+BuildRequires: python2-devel, python-docutils, python-nose
+
+%if 0%{?el6}
+Requires: PyYAML
+Requires: python-argparse, python-importlib, python-logutils, python-unittest2
+BuildRequires: PyYAML
+BuildRequires: python-argparse, python-logutils, python-unittest2
 %else
-Requires: python, python-requests, fabric, pyliblzma, libvirt-python, pystache, python-yaml
-BuildRequires: python2-devel, python-docutils, python-yaml
+Requires: python-yaml
+BuildRequires: python-yaml, fabric
+%endif
+
+%if !0%{?el7}
+BuildRequires: python-flexmock
 %endif
 
 %description
@@ -25,13 +33,7 @@ these days a framework) to perform automated testing.
 
 %build
 %{__python} setup.py build
-%if "%{?dist}" == ".el6"
-%{__python} /usr/bin/rst2man man/avocado.rst man/avocado.1
-%{__python} /usr/bin/rst2man man/avocado-rest-client.rst man/avocado-rest-client.1
-%else
-%{__python2} /usr/bin/rst2man man/avocado.rst man/avocado.1
-%{__python2} /usr/bin/rst2man man/avocado-rest-client.rst man/avocado-rest-client.1
-%endif
+%{__make} man
 
 %install
 %{__python} setup.py install --root %{buildroot} --skip-build
@@ -39,6 +41,14 @@ these days a framework) to perform automated testing.
 %{__install} -m 0644 man/avocado.1 %{buildroot}%{_mandir}/man1/avocado.1
 %{__install} -m 0644 man/avocado-rest-client.1 %{buildroot}%{_mandir}/man1/avocado-rest-client.1
 
+# Running the unittests is currently disabled on EL6 because fabric is
+# missing on EPEL 6 and also on EL7 because python-flexmock is missing
+# on EPEL7.
+%if !0%{?rhel}
+%check
+selftests/run selftests/all/unit
+%endif
+
 %files
 %defattr(-,root,root,-)
 %doc README.rst LICENSE
@@ -89,6 +99,11 @@ examples of how to write tests on your own.
 %{_datadir}/avocado/api
 
 %changelog
+* Sat Mar 28 2015 Cleber Rosa <cleber@redhat.com> - 0.21.0-5
+- Change the way man pages are built, now using Makefile targets
+- Reorganized runtime and build requirements
+- Add a check section that runs unittests on Fedora
+
 * Thu Mar 19 2015 Lucas Meneghel Rodrigues - 0.21.0-4
 - COPR build fixes