watchman: update Python subpackage

Signed-off-by: Michel Alexandre Salim <salimma@fedoraproject.org>

1 files changed, 37 insertions, 8 deletions

diff --git a/utils/watchman.spec b/utils/watchman.spec
index ffdac68..dd6c110 100644
--- a/utils/watchman.spec
+++ b/utils/watchman.spec
@@ -1,6 +1,14 @@
+# some Python tests are failing
+# The following tests FAILED:
+#          40 - CacheTest.future (Child aborted)
+#         290 - test_py::tests.integration.test_site_spawn.TestSiteSpawn.test_failingSpawner (Failed)
+#         292 - test_py::tests.integration.test_site_spawn.TestSiteSpawn.test_spawner (Failed)
+# Errors while running CTest
+%bcond_with tests
+
 Name:           watchman
 Version:        2020.09.21.00
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        File alteration monitoring service
 
 License:        ASL 2.0
@@ -11,23 +19,30 @@ Patch0:         %{name}-py_destdir.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  folly-devel
-BuildRequires:  python3-devel
+BuildRequires:  pcre-devel
 
 %description
 Watchman exists to watch files and record when they actually change. It can also
 trigger actions (such as rebuilding assets) when matching files change.
 
 
-%package -n python3-%{name}
+%package -n python3-py%{name}
 Summary:        Python bindings for %{name}
+License:        BSD and MIT
+BuildRequires:  procps-ng
+BuildRequires:  python3-devel
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+# watchman-diag shells out to ps
+Requires:       procps-ng
 
-%description -n python3-%{name}
-The python3-%{name} package contains Python bindings for %{name}.
+%description -n python3-py%{name}
+The python3-py%{name} package contains Python bindings for %{name}.
 
 
 %prep
 %autosetup -p1
+# Fix pywatchman version.
+sed -ie "s|version=\"1.4.1\"|version=\"%{version}\"|" python/setup.py
 
 
 %build
@@ -39,16 +54,30 @@ The python3-%{name} package contains Python bindings for %{name}.
 %cmake_install
 
 
+%if %{with tests}
+%check
+%ctest
+%endif
+
+
 %files
 %license LICENSE
 %doc CODE_OF_CONDUCT.md README.markdown
-%{_bindir}/watchman*
+%{_bindir}/watchman
 
-%files -n python3-%{name}
+%files -n python3-py%{name}
+%license python/LICENSE
+%{_bindir}/watchman-*
 %{python3_sitearch}/py%{name}
-%{python3_sitearch}/py%{name}-?.?.?-py%{python3_version}.egg-info
+%{python3_sitearch}/py%{name}-%{version}-py%{python3_version}.egg-info
 
 
 %changelog
+* Wed Nov 11 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.09.21.00-2
+- Enable tests
+- Rename Python subpackage
+- Fix version number and licensing for Python subpackage
+- Move Python scripts to the Python subpackage
+
 * Tue Nov 10 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 2020.09.21.00-1
 - Initial package