diff --git a/.gitignore b/.gitignore index eb1da25..56d91c9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,13 @@ results_beaker /beaker-24.4.tar.xz /beaker-24.5.tar.xz /beaker-25.0.tar.xz +/beaker-25.2.tar.xz +/beaker-25.4.tar.xz +/beaker-25.5.tar.xz +/beaker-25.6.tar.xz +/beaker-26.0.tar.xz +/beaker-26.3.tar.xz +/beaker-26.5.tar.xz +/beaker-26.5-49-g97e14daec.tar.gz +/beaker-26.6-66-g03e169493.tar.gz +/beaker-26.6.tar.xz diff --git a/0001_dont_build_server.diff b/0001_dont_build_server.diff new file mode 100644 index 0000000..a4604db --- /dev/null +++ b/0001_dont_build_server.diff @@ -0,0 +1,35 @@ +diff --git a/Makefile b/Makefile +index 4297c8d..c1d172e 100644 +--- a/Makefile ++++ b/Makefile +@@ -6,7 +6,7 @@ + + DEPCMD := $(shell if [ -f /usr/bin/dnf ]; then echo "dnf builddep"; else echo "yum-builddep"; fi) + +-SUBDIRS := Common Client documentation Server LabController IntegrationTests ++SUBDIRS := Common Client documentation + + .PHONY: build + build: +diff --git a/documentation/Makefile b/documentation/Makefile +index 60cf807..3d449d3 100644 +--- a/documentation/Makefile ++++ b/documentation/Makefile +@@ -2,7 +2,7 @@ + # + + SHELL = /bin/bash +-export PYTHONPATH=../Common:../Server:../Client/src ++export PYTHONPATH=../Common:../Client/src + SPHINXBUILD ?= $(firstword $(shell command -v sphinx-1.0-build sphinx-build)) + + # This Makefile contains some frustrating hacks, centering around the fact that +@@ -30,7 +30,7 @@ SPHINXREQUIRES = "Sphinx >= 1.0", + ifeq (0,$(shell python2 -c '__requires__ = ["CherryPy < 3.0"]; import pkg_resources' &>/dev/null ; echo $$?)) + SPHINXREQUIRES += "CherryPy < 3.0", + endif +-BKR_PATH_INJECTED = "../Common/bkr", "../Server/bkr", "../Client/src/bkr" ++BKR_PATH_INJECTED = "../Common/bkr", "../Client/src/bkr" + + # You can set these variables from the command line. + SPHINXOPTS = diff --git a/beaker.spec b/beaker.spec index f5d5783..db19a1f 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,33 +1,27 @@ -%if 0%{?rhel} && 0%{?rhel} <= 6 -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -%endif - # The server, lab controller, and integration test subpackages can be conditionally built. # Use rpmbuild --without to override. %global _lc_services beaker-proxy beaker-provision beaker-watchdog beaker-transfer -# systemd? -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 %global with_systemd 1 -%else -%global with_systemd 0 -%endif # This will not necessarily match the RPM Version if the real version number is # not representable in RPM. For example, a release candidate might be 0.15.0rc1 # but that is not usable for the RPM Version because it sorts higher than # 0.15.0, so the RPM will have Version 0.15.0 and Release 0.rc1 in that case. %global upstream_name beaker +%global with_docs 1 +%global git_version 26.6-66-g03e169493 Name: %{upstream_name} -Version: 25.0 -Release: 1%{?dist} +Version: 26.6 +Release: 1.git.66.g03e169493%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD URL: https://beaker-project.org/ Source0: https://beaker-project.org/releases/%{upstream_name}-%{version}.tar.xz +# Explicitly remove building server from the Makefiles +Patch1: 0001_dont_build_server.diff BuildArch: noarch BuildRequires: python-setuptools @@ -37,36 +31,11 @@ BuildRequires: python-mock BuildRequires: python-setuptools BuildRequires: python2-devel BuildRequires: python-docutils >= 0.6 -# These are needed just to build the server manpages -#BuildRequires: python-sqlalchemy -#BuildRequires: TurboGears -#BuildRequires: python-flask -#BuildRequires: python2-decorator -#BuildRequires: python-webassets -#BuildRequires: python-netaddr -#BuildRequires: python-ldap -#BuildRequires: cracklib-python -#BuildRequires: python2-passlib -#BuildRequires: rpm-python -%if 0%{?rhel} == 5 || 0%{?rhel} == 6 -BuildRequires: python-sphinx10 -%else BuildRequires: python-sphinx >= 1.0 -%endif BuildRequires: python-sphinxcontrib-httpdomain -BuildRequires: python-prettytable -# setup.py uses pkg-config to find the right installation paths -%if 0%{?fedora} || 0%{?rhel} >= 7 -BuildRequires: pkgconfig(bash-completion) -%endif -%if %{with_systemd} BuildRequires: pkgconfig(systemd) -%endif -%if 0%{?rhel} >= 6 || 0%{?fedora} # some client commands use requests, they are unsupported on RHEL5 BuildRequires: python-requests -%endif - # As above, these client dependencies are needed in build because of sphinx BuildRequires: python-krbV BuildRequires: python-lxml @@ -76,24 +45,24 @@ BuildRequires: libxslt-python %package common Summary: Common components for Beaker packages Group: Applications/Internet -Provides: %{upstream_name} = %{version}-%{release} - +Provides: %{name} = %{version}-%{release} +Obsoletes: %{name} < 0.17.0-1 %package client Summary: Command-line client for interacting with Beaker Group: Applications/Internet +Requires: %{name}-common = %{version}-%{release} +BuildRequires: pkgconfig(bash-completion) +BuildRequires: python-krbV +BuildRequires: python-lxml +BuildRequires: libxslt-python +BuildRequires: python-prettytable +Requires: python Requires: python-setuptools -Requires: %{upstream_name}-common = %{version}-%{release} Requires: python-krbV Requires: python-lxml -%if 0%{?rhel} >= 6 || 0%{?fedora} -# some client commands use requests, they are unsupported on RHEL5 Requires: python-requests -%endif Requires: libxslt-python -%if !(0%{?rhel} >= 6 || 0%{?fedora} >= 14) -Requires: python-simplejson -%endif Requires: libxml2-python Requires: python-prettytable Requires: python-jinja2 @@ -113,11 +82,13 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. %prep %setup -q -n %{upstream_name}-%{version} +%patch1 -p1 # The server relies on a great many packages which are intended to be bundled # source, and its documentation greatly inflates the number of BR packages # required. Until those are packaged separately, building those subpackages is -# unnnecessary -rm -r Server documentation/server-api +# unnnecessary. LabController and IntegrationTests are specifically designed to +# be used as part of the server setup. They also get removed +rm -r Server documentation/server-api LabController IntegrationTests %build make @@ -125,6 +96,13 @@ make %install DESTDIR=%{buildroot} make install +# Integration tests are to be used on the server to ensure it's setup properly +rm -rf %{buildroot}%{_datadir}/beaker-integration-tests/ +rm -rf %{buildroot}%{python2_sitelib}/bkr/inttest +rm -rf %{buildroot}%{python2_sitelib}/beaker_integration_tests* +# These man pages are for server/lab-controller stuff that we're not packaging +rm -rf %{buildroot}%{_mandir}/man8/ + %check make check @@ -136,32 +114,57 @@ make check %{python2_sitelib}/bkr/timeout_xmlrpclib.py* %{python2_sitelib}/bkr/common/ %{python2_sitelib}/bkr/log.py* -%{python2_sitelib}/%{upstream_name}_common-%{version}-py2.7.egg-info/ -%{_mandir}/man8/%{upstream_name}-import.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-create-ipxe-image.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-create-kickstart.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-init.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-repo-update.8.gz -%exclude %{_mandir}/man8/%{upstream_name}-usage-reminder.8.gz +%{python2_sitelib}/%{name}_common-%{version}-py2.7.egg-info/ %files client -%dir %{_sysconfdir}/%{upstream_name} +%dir %{_sysconfdir}/%{name} %doc Client/client.conf.example %{python2_sitelib}/bkr/client/ -%{python2_sitelib}/%{upstream_name}_client-%{version}-py2.7-nspkg.pth -%{python2_sitelib}/%{upstream_name}_client-%{version}-py2.7.egg-info/ -%{_bindir}/%{upstream_name}-wizard +%{python2_sitelib}/%{name}_client-%{version}-py2.7-nspkg.pth +%{python2_sitelib}/%{name}_client-%{version}-py2.7.egg-info/ +%{_bindir}/%{name}-wizard %{_bindir}/bkr -%{_mandir}/man1/beaker-wizard.1.gz +%{_mandir}/man1/%{name}-wizard.1.gz %{_mandir}/man1/bkr.1.gz %{_mandir}/man1/bkr-*.1.gz -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 %{_datadir}/bash-completion -%else -%{_sysconfdir}/bash_completion.d -%endif %changelog +* Thu Jan 24 2019 Greg Hellings - 26.3-1 +- New upstream 26.3 + +* Fri Nov 02 2018 Greg Hellings - 26.0-1 +- New upstream 26.0 + +* Wed Sep 05 2018 Greg Hellings - 25.6-1 +- New upstream 25.6 + +* Thu Aug 02 2018 Greg Hellings - 25.5-2 +- Corrected Requires for EPEL +- Remove lab-controller from builds, as it is part of the server +- Heavily modified spec file to more closely match upstream +- Updated patch to not build server, integration tests, or lab-controller + +* Wed Jul 25 2018 Greg Hellings - 25.5-1 +- Upstream version 25.5 +- Fixes BZ1607380 +- Added deps for gevent and werkzeug +- Added labcontroller subpackage + +* Fri Jul 13 2018 Dan Callaghan - 25.4-3 +- Explicitly invoke python2 instead of python: + https://fedoraproject.org/wiki/Changes/Move_usr_bin_python_into_separate_package + +* Thu Jul 12 2018 Fedora Release Engineering - 25.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 25 2018 Greg Hellings - 25.4-1 +- Upstream version 25.4 +- Fixes BZ 1579575 + +* Mon May 14 2018 Greg Hellings - 25.2-1 +- Upstream version 25.2 + * Tue Mar 13 2018 Greg Hellings - 25.0-1 - Upstream version 25.0 diff --git a/sources b/sources index 294628b..2d4dfde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.0.tar.xz) = 5c069fa8a969255c296aa686d7832870d2923dd9c15ed6f37fa441b62a743399d54468b83bdf85cbe938ecfeacd778c0da18fec4326e502d072fdf2ced7bbacd +SHA512 (beaker-26.6.tar.xz) = 43c75d5c524b0013e14e6f85ff0f1c2b4560b94dbed8ad48ac40fb264cd5e847bf1fce60c3101f9d9de25e8da273fde4d910cee649a1acea1e55227feb89cdca