From 0b7222be9a1362c5c595f393d15bd3723e27a08e Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: Dec 11 2018 12:23:51 +0000 Subject: [PATCH 1/3] Add buildbot-www subpackage --- diff --git a/buildbot.spec b/buildbot.spec index 9dbb9f5..e3048a7 100644 --- a/buildbot.spec +++ b/buildbot.spec @@ -109,6 +109,35 @@ Obsoletes: %{name}-doc < %{version}-%{release} This package contains only the buildworker implementation. The buildbot-master package contains the buildmaster. +%package www +Version: %{version} +Summary: Build/test automation system +Provides: %{name}-www = %{version}-%{release} + +%description www +Provides web frontend for buildbot. + +# Script to get bundled js +# cat \ +# ./www/codeparameter/package.json \ +# ./www/console_view/package.json \ +# ./www/base/package.json \ +# ./www/waterfall_view/package.json \ +# ./www/data_module/package.json \ +# ./www/grid_view/package.json \ +# | jq '.dependencies' | sed 's/[{}, ]//g' | sort -u + + +Provides: bundled(guanlecoja) = 0.8.0 +Provides: bundled(guanlecoja) = 0.8.3 +Provides: bundled(gulp) = 3.9.0 +Provides: bundled(gulp) = 3.9.1 +Provides: bundled(gulp-shell) = 0.4.1 +Provides: bundled(http-proxy) = 1.11.1 +Provides: bundled(minimist) = 1.1.1 +Provides: bundled(shelljs) = 0.5.3 + + %if %{with docs} %package doc Summary: Buildbot documentation @@ -118,7 +147,7 @@ Summary: Buildbot documentation %endif %prep -%autosetup -p1 -a1 +%setup -q -b0 -b1 -b2 -b3 -b4 -b5 %build %py3_build @@ -137,6 +166,24 @@ popd %install %py3_install + +# unpack wheel -www packages +pushd .. + +cp -R %{name}_www %{buildroot}/%{python3_sitelib}/ +cp -R %{name}_www-%{version}.dist-info %{buildroot}/%{python3_sitelib}/ + +cp -R %{name}_waterfall_view %{buildroot}/%{python3_sitelib}/ +cp -R %{name}_waterfall_view-%{version}.dist-info %{buildroot}/%{python3_sitelib}/ + +cp -R %{name}_grid_view %{buildroot}/%{python3_sitelib}/ +cp -R %{name}_grid_view-%{version}.dist-info %{buildroot}/%{python3_sitelib}/ + +cp -R %{name}_console_view %{buildroot}/%{python3_sitelib}/ +cp -R %{name}_console_view-%{version}.dist-info %{buildroot}/%{python3_sitelib}/ + +popd + install -Dpm0644 -t %{buildroot}%{_mandir}/man1 docs/buildbot.1 %if %{with docs} @@ -178,6 +225,16 @@ trial buildbot.test %{python3_sitelib}/buildbot_worker/ %{python3_sitelib}/buildbot_worker-*egg-info/ +%files www +%{python3_sitelib}/buildbot_www/ +%{python3_sitelib}/buildbot_www-%{version}.dist-info/ +%{python3_sitelib}/buildbot_waterfall_view/ +%{python3_sitelib}/buildbot_waterfall_view-%{version}.dist-info/ +%{python3_sitelib}/buildbot_grid_view/ +%{python3_sitelib}/buildbot_grid_view-%{version}.dist-info/ +%{python3_sitelib}/buildbot_console_view/ +%{python3_sitelib}/buildbot_console_view-%{version}.dist-info/ + %if %{with docs} %files doc %{_pkgdocdir}/ @@ -327,7 +384,7 @@ trial buildbot.test * Tue Mar 3 2009 Gianluca Sforna - 0.7.10p1-2 - New upstream release -- darcs only avaliable on ix86 platforms +- darcs only avaliable on ix86 platforms * Thu Feb 26 2009 Gianluca Sforna - 0.7.10-1 - New upstream release @@ -347,7 +404,7 @@ trial buildbot.test - new upstream release * Thu Jan 3 2008 Gianluca Sforna - 0.7.6-2 -- pick up new .egg file +- pick up new .egg file * Mon Oct 15 2007 Gianluca Sforna - 0.7.6-1 - new upstream release From d6f529e24e23bf0f8e22e5c7fe64b62f39aa26e8 Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: Dec 11 2018 12:28:24 +0000 Subject: [PATCH 2/3] Fix issues found in PR review --- diff --git a/buildbot.spec b/buildbot.spec index e3048a7..711e7a2 100644 --- a/buildbot.spec +++ b/buildbot.spec @@ -16,6 +16,10 @@ License: GPLv2 URL: https://buildbot.net Source0: %{pypi_source buildbot} Source1: %{pypi_source buildbot-worker} +Source2: https://files.pythonhosted.org/packages/1f/aa/66fcc2ce560759bab61cdbaa04ab2bfd58b7d0afb5bbd6a08d1785e1dd13/%{name}_www-%{version}-py2.py3-none-any.whl +Source3: https://files.pythonhosted.org/packages/aa/19/a4a8f19b0256811a9e91c2c6f8827aac37617ad00da2189b5ad1cb45fd48/%{name}_waterfall_view-%{version}-py2.py3-none-any.whl +Source4: https://files.pythonhosted.org/packages/34/b7/28509b4f5183d454f0099c6b2ee4161b0d49208a2231657fa1633f4b6e10/%{name}_grid_view-%{version}-py2.py3-none-any.whl +Source5: https://files.pythonhosted.org/packages/f3/f4/8531190f8ad2c11c978e43994b7138dedd8ff4b8163a4b4e8745e4e3bed9/%{name}_console_view-%{version}-py2.py3-none-any.whl BuildArch: noarch @@ -110,9 +114,16 @@ This package contains only the buildworker implementation. The buildbot-master package contains the buildmaster. %package www -Version: %{version} Summary: Build/test automation system -Provides: %{name}-www = %{version}-%{release} + +Provides: bundled(guanlecoja) = 0.8.0 +Provides: bundled(guanlecoja) = 0.8.3 +Provides: bundled(gulp) = 3.9.0 +Provides: bundled(gulp) = 3.9.1 +Provides: bundled(gulp-shell) = 0.4.1 +Provides: bundled(http-proxy) = 1.11.1 +Provides: bundled(minimist) = 1.1.1 +Provides: bundled(shelljs) = 0.5.3 %description www Provides web frontend for buildbot. @@ -128,16 +139,6 @@ Provides web frontend for buildbot. # | jq '.dependencies' | sed 's/[{}, ]//g' | sort -u -Provides: bundled(guanlecoja) = 0.8.0 -Provides: bundled(guanlecoja) = 0.8.3 -Provides: bundled(gulp) = 3.9.0 -Provides: bundled(gulp) = 3.9.1 -Provides: bundled(gulp-shell) = 0.4.1 -Provides: bundled(http-proxy) = 1.11.1 -Provides: bundled(minimist) = 1.1.1 -Provides: bundled(shelljs) = 0.5.3 - - %if %{with docs} %package doc Summary: Buildbot documentation From 31e5d30d0f2371a233b4c791caeb60e96c37253b Mon Sep 17 00:00:00 2001 From: František Zatloukal Date: Dec 11 2018 13:39:08 +0000 Subject: [PATCH 3/3] Fix Build --- diff --git a/buildbot.spec b/buildbot.spec index 711e7a2..0d47230 100644 --- a/buildbot.spec +++ b/buildbot.spec @@ -21,6 +21,13 @@ Source3: https://files.pythonhosted.org/packages/aa/19/a4a8f19b0256811a9e Source4: https://files.pythonhosted.org/packages/34/b7/28509b4f5183d454f0099c6b2ee4161b0d49208a2231657fa1633f4b6e10/%{name}_grid_view-%{version}-py2.py3-none-any.whl Source5: https://files.pythonhosted.org/packages/f3/f4/8531190f8ad2c11c978e43994b7138dedd8ff4b8163a4b4e8745e4e3bed9/%{name}_console_view-%{version}-py2.py3-none-any.whl +# To get latest sources for buildbot-www +# export VERSION=1.6.0; +# for PROJECT in buildbot-www buildbot-waterfall-view buildbot-grid-view buildbot-console-view; do +# curl -s "https://pypi.org/pypi/$PROJECT/$VERSION/json" \ +# | jq -r ".releases | .\"$VERSION\" | .[] | select(.packagetype == \"bdist_wheel\") | .url" +# done + BuildArch: noarch BuildRequires: python3-devel @@ -116,6 +123,16 @@ The buildbot-master package contains the buildmaster. %package www Summary: Build/test automation system +# Script to get bundled js +# cat \ +# ./www/codeparameter/package.json \ +# ./www/console_view/package.json \ +# ./www/base/package.json \ +# ./www/waterfall_view/package.json \ +# ./www/data_module/package.json \ +# ./www/grid_view/package.json \ +# | jq '.dependencies' | sed 's/[{}, ]//g' | sort -u + Provides: bundled(guanlecoja) = 0.8.0 Provides: bundled(guanlecoja) = 0.8.3 Provides: bundled(gulp) = 3.9.0 @@ -128,17 +145,6 @@ Provides: bundled(shelljs) = 0.5.3 %description www Provides web frontend for buildbot. -# Script to get bundled js -# cat \ -# ./www/codeparameter/package.json \ -# ./www/console_view/package.json \ -# ./www/base/package.json \ -# ./www/waterfall_view/package.json \ -# ./www/data_module/package.json \ -# ./www/grid_view/package.json \ -# | jq '.dependencies' | sed 's/[{}, ]//g' | sort -u - - %if %{with docs} %package doc Summary: Buildbot documentation @@ -160,7 +166,7 @@ make docs.tgz VERSION="%{version}" SPHINXBUILD=sphinx-build-2 popd %endif -pushd %{name}-worker-%{version} +pushd ../%{name}-worker-%{version} %py3_build popd @@ -193,7 +199,7 @@ tar xf docs/docs.tgz --strip-components=1 -C %{buildroot}%{_pkgdocdir} %endif # install worker files -pushd %{name}-worker-%{version} +pushd ../%{name}-worker-%{version} %py3_install install -Dpm0644 -t %{buildroot}%{_mandir}/man1 docs/buildbot-worker.1 popd @@ -216,7 +222,6 @@ trial buildbot.test %{_mandir}/man1/buildbot.1* %{python3_sitelib}/buildbot/ %{python3_sitelib}/buildbot-*egg-info/ -%{_datadir}/%{name} %files worker %doc NEWS UPGRADING