From 128e8a9f407bf21bad5f56011d53bbd175a66dea Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 6 Apr 2017 12:44:47 -0500 Subject: [PATCH 01/11] Upstream version 24.2 --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 77753e4..5394586 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.src.rpm results_beaker /beaker-24.1.tar.xz +/beaker-24.2.tar.xz diff --git a/beaker.spec b/beaker.spec index 8e362a4..e7e7ec5 100644 --- a/beaker.spec +++ b/beaker.spec @@ -17,12 +17,12 @@ # 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_version 24.1 +%global upstream_version 24.2 %global upstream_name beaker Name: %{upstream_name} Version: %{upstream_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -163,6 +163,9 @@ make check %endif %changelog +* Thu Apr 06 2017 Greg Hellings - 24.2-1 +- Upstream release 24.2 + * Mon Mar 06 2017 Greg Hellings - 24.1-2 - Fixed broken dependency diff --git a/sources b/sources index ad22a50..3991db9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-24.1.tar.xz) = 924f2242313955e324f80dbf8553a5effed9bdefc6e0bc01fc545dd5702883e756556c03ceef06a3a664164a39828ae15695a3f0cc6f4d41b46982a38c4f4712 +SHA512 (beaker-24.2.tar.xz) = 3a7fe7c97f758d48c60e7eb7c6687d7f375341092d2d4c4995474427b0351ac0fc66a93c078332636314b177c1a5d048853322b02c44aafa5a4e795f8cc6c8cc From e367eeedb2a1603e03ce7b84e5f30d2fb8883c30 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Mon, 14 May 2018 23:40:40 -0500 Subject: [PATCH 02/11] Upstream version 25.2 --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eb1da25..d359410 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ results_beaker /beaker-24.4.tar.xz /beaker-24.5.tar.xz /beaker-25.0.tar.xz +/beaker-25.2.tar.xz diff --git a/beaker.spec b/beaker.spec index f5d5783..fdf8160 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,7 +20,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.0 +Version: 25.2 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -162,6 +162,9 @@ make check %endif %changelog +* 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..c82c53c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.0.tar.xz) = 5c069fa8a969255c296aa686d7832870d2923dd9c15ed6f37fa441b62a743399d54468b83bdf85cbe938ecfeacd778c0da18fec4326e502d072fdf2ced7bbacd +SHA512 (beaker-25.2.tar.xz) = 9740e2478bd9997760323a5f3688c8d3ce6fd0995e1aa17d5e4764c7a357dcf3ceaf7f7df633e573c9ff46d5ae396bd7c1bb277cf219f246ac253ced437aabc2 From 05d4735d2e5d45030c7380cf9e4b36e7477f51b8 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 25 May 2018 12:00:36 -0500 Subject: [PATCH 03/11] Upstream version 25.4 Fixes BZ#1579575 --- .gitignore | 1 + beaker.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d359410..28164b2 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ results_beaker /beaker-24.5.tar.xz /beaker-25.0.tar.xz /beaker-25.2.tar.xz +/beaker-25.4.tar.xz diff --git a/beaker.spec b/beaker.spec index fdf8160..d27ec78 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,7 +20,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.2 +Version: 25.4 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -162,6 +162,10 @@ make check %endif %changelog +* 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 diff --git a/sources b/sources index c82c53c..b901595 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.2.tar.xz) = 9740e2478bd9997760323a5f3688c8d3ce6fd0995e1aa17d5e4764c7a357dcf3ceaf7f7df633e573c9ff46d5ae396bd7c1bb277cf219f246ac253ced437aabc2 +SHA512 (beaker-25.4.tar.xz) = 68b94e75500362e2bb277828dbac716a0be900a5beb41f9a4e176b6a8e2c5f284d7f33870c3a57998dd9f2b5c4c81e7f83c1744ee327bc1e9ff0a8a7774cdebf From 93c622968720672ac0161d9b002da84ec253742e Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Wed, 25 Jul 2018 08:47:00 -0500 Subject: [PATCH 04/11] Upstream version 25.5 & labcontroller --- .gitignore | 1 + 0001_dont_build_server.diff | 35 +++++++++++++++++++++++++ beaker.spec | 52 ++++++++++++++++++++++++++++++++++++- sources | 2 +- 4 files changed, 88 insertions(+), 2 deletions(-) create mode 100644 0001_dont_build_server.diff diff --git a/.gitignore b/.gitignore index 28164b2..241cd91 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ results_beaker /beaker-25.0.tar.xz /beaker-25.2.tar.xz /beaker-25.4.tar.xz +/beaker-25.5.tar.xz diff --git a/0001_dont_build_server.diff b/0001_dont_build_server.diff new file mode 100644 index 0000000..6ff93cc --- /dev/null +++ b/0001_dont_build_server.diff @@ -0,0 +1,35 @@ +diff --git a/Makefile b/Makefile +index 4297c8d..c463c0b 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 LabController IntegrationTests + + .PHONY: build + build: +diff --git a/documentation/Makefile b/documentation/Makefile +index 60cf807..33411d0 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 d27ec78..6678c8c 100644 --- a/beaker.spec +++ b/beaker.spec @@ -20,7 +20,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.4 +Version: 25.5 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -28,6 +28,8 @@ 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,6 +39,8 @@ BuildRequires: python-mock BuildRequires: python-setuptools BuildRequires: python2-devel BuildRequires: python-docutils >= 0.6 +BuildRequires: python-gevent +BuildRequires: python-werkzeug # These are needed just to build the server manpages #BuildRequires: python-sqlalchemy #BuildRequires: TurboGears @@ -78,6 +82,16 @@ Summary: Common components for Beaker packages Group: Applications/Internet Provides: %{upstream_name} = %{version}-%{release} +%package labcontroller +Summary: Beaker labcontroller service files +Group: Applications/Internet +Requires: %{upstream_name}-common = %{version}-%{release} +Requires: python-gevent +Requires: python-werkzeug + +%description labcontroller +Files to run the Beaker labcontroller functionality + %package client Summary: Command-line client for interacting with Beaker @@ -97,6 +111,8 @@ Requires: python-simplejson Requires: libxml2-python Requires: python-prettytable Requires: python-jinja2 +Requires: python2-gevent +Requires: python2-werkzeug # beaker-wizard was moved from rhts-devel to here in 4.52 Conflicts: rhts-devel < 4.52 @@ -113,6 +129,7 @@ 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 @@ -125,6 +142,11 @@ make %install DESTDIR=%{buildroot} make install +rm -rf %{buildroot}%{_datadir}/bkr/lab-controller/*.rpm +rm -rf %{buildroot}%{_datadir}/beaker-integration-tests/ +rm -rf %{buildroot}%{python2_sitelib}/bkr/inttest +rm -rf %{buildroot}%{python2_sitelib}/beaker_integration_tests* + %check make check @@ -144,6 +166,21 @@ make check %exclude %{_mandir}/man8/%{upstream_name}-repo-update.8.gz %exclude %{_mandir}/man8/%{upstream_name}-usage-reminder.8.gz +%files labcontroller +%{_bindir}/beaker-* +%{_sysconfdir}/beaker/labcontroller.conf +%{_sysconfdir}/cron.hourly/beaker_expire_distros +%{_sysconfdir}/httpd/conf.d/beaker-lab-controller.conf +%{_sysconfdir}/rsyslog.d/beaker-lab-controller.conf +%{_sysconfdir}/sudoers.d/beaker_proxy_clear_netboot +%{python2_sitelib}/bkr/labcontroller/ +%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?.egg-info +%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?-nspkg.pth +%{_unitdir}/beaker-*.service +%{_tmpfilesdir}/beaker-lab-controller.conf +%{_datadir}/bkr/lab-controller/ +%{_sharedstatedir}/beaker/ + %files client %dir %{_sysconfdir}/%{upstream_name} %doc Client/client.conf.example @@ -162,6 +199,19 @@ make check %endif %changelog +* 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 diff --git a/sources b/sources index b901595..73062d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.4.tar.xz) = 68b94e75500362e2bb277828dbac716a0be900a5beb41f9a4e176b6a8e2c5f284d7f33870c3a57998dd9f2b5c4c81e7f83c1744ee327bc1e9ff0a8a7774cdebf +SHA512 (beaker-25.5.tar.xz) = 7972dfd51c467492df0358a3886f61ca72fdb2bdfe67ec2de3aea47305ebfbcbdf5b8c35da8d43998dfa78e4aa170bd413498d26ac4360b488404a088ba2a808 From 02323aa99713e60124681c5814bdbf0523f72373 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 2 Aug 2018 09:35:34 -0500 Subject: [PATCH 05/11] Correcting Requires --- beaker.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/beaker.spec b/beaker.spec index 6678c8c..c59a59a 100644 --- a/beaker.spec +++ b/beaker.spec @@ -21,7 +21,7 @@ Name: %{upstream_name} Version: 25.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -111,8 +111,8 @@ Requires: python-simplejson Requires: libxml2-python Requires: python-prettytable Requires: python-jinja2 -Requires: python2-gevent -Requires: python2-werkzeug +Requires: python-gevent +Requires: python-werkzeug # beaker-wizard was moved from rhts-devel to here in 4.52 Conflicts: rhts-devel < 4.52 @@ -199,6 +199,9 @@ make check %endif %changelog +* Thu Aug 02 2018 Greg Hellings - 25.5-2 +- Corrected Requires for EPEL + * Wed Jul 25 2018 Greg Hellings - 25.5-1 - Upstream version 25.5 - Fixes BZ1607380 From 45fc37a4a0146ac733bd6ceaafbbdd849f39eff0 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 3 Aug 2018 07:54:35 -0500 Subject: [PATCH 06/11] Heavy updates to make it work in EPEL7 Changed around sub-packaging naming scheme Updated BR and Requires Rearranged file to more closely model upstream --- 0001_dont_build_server.diff | 8 +-- beaker.spec | 116 ++++++++---------------------------- 2 files changed, 28 insertions(+), 96 deletions(-) diff --git a/0001_dont_build_server.diff b/0001_dont_build_server.diff index 6ff93cc..a4604db 100644 --- a/0001_dont_build_server.diff +++ b/0001_dont_build_server.diff @@ -1,5 +1,5 @@ diff --git a/Makefile b/Makefile -index 4297c8d..c463c0b 100644 +index 4297c8d..c1d172e 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ @@ -7,12 +7,12 @@ index 4297c8d..c463c0b 100644 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 LabController IntegrationTests ++SUBDIRS := Common Client documentation .PHONY: build build: diff --git a/documentation/Makefile b/documentation/Makefile -index 60cf807..33411d0 100644 +index 60cf807..3d449d3 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -2,7 +2,7 @@ @@ -20,7 +20,7 @@ index 60cf807..33411d0 100644 SHELL = /bin/bash -export PYTHONPATH=../Common:../Server:../Client/src -+export PYTHONPATH=../Common::../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 diff --git a/beaker.spec b/beaker.spec index c59a59a..f140421 100644 --- a/beaker.spec +++ b/beaker.spec @@ -1,17 +1,7 @@ -%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 @@ -39,38 +29,11 @@ BuildRequires: python-mock BuildRequires: python-setuptools BuildRequires: python2-devel BuildRequires: python-docutils >= 0.6 -BuildRequires: python-gevent -BuildRequires: python-werkzeug -# 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 @@ -80,39 +43,27 @@ BuildRequires: libxslt-python %package common Summary: Common components for Beaker packages Group: Applications/Internet -Provides: %{upstream_name} = %{version}-%{release} - -%package labcontroller -Summary: Beaker labcontroller service files -Group: Applications/Internet -Requires: %{upstream_name}-common = %{version}-%{release} -Requires: python-gevent -Requires: python-werkzeug - -%description labcontroller -Files to run the Beaker labcontroller functionality - +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 -Requires: python-gevent -Requires: python-werkzeug # beaker-wizard was moved from rhts-devel to here in 4.52 Conflicts: rhts-devel < 4.52 @@ -133,8 +84,9 @@ can use it to submit Beaker jobs, fetch results, and perform many other tasks. # 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 @@ -142,10 +94,12 @@ make %install DESTDIR=%{buildroot} make install -rm -rf %{buildroot}%{_datadir}/bkr/lab-controller/*.rpm +# 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 @@ -158,49 +112,27 @@ 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 - -%files labcontroller -%{_bindir}/beaker-* -%{_sysconfdir}/beaker/labcontroller.conf -%{_sysconfdir}/cron.hourly/beaker_expire_distros -%{_sysconfdir}/httpd/conf.d/beaker-lab-controller.conf -%{_sysconfdir}/rsyslog.d/beaker-lab-controller.conf -%{_sysconfdir}/sudoers.d/beaker_proxy_clear_netboot -%{python2_sitelib}/bkr/labcontroller/ -%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?.egg-info -%{python2_sitelib}/beaker_lab_controller-%{version}-py?.?-nspkg.pth -%{_unitdir}/beaker-*.service -%{_tmpfilesdir}/beaker-lab-controller.conf -%{_datadir}/bkr/lab-controller/ -%{_sharedstatedir}/beaker/ +%{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 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 From e432dd2e801252cc467d63fc09a98c1a9a0c59e1 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Wed, 5 Sep 2018 22:07:09 -0500 Subject: [PATCH 07/11] Upstream version 25.6 --- .gitignore | 1 + beaker.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 241cd91..eae8a9f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ results_beaker /beaker-25.2.tar.xz /beaker-25.4.tar.xz /beaker-25.5.tar.xz +/beaker-25.6.tar.xz diff --git a/beaker.spec b/beaker.spec index f140421..3eb6a0d 100644 --- a/beaker.spec +++ b/beaker.spec @@ -10,8 +10,8 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.5 -Release: 2%{?dist} +Version: 25.6 +Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet License: GPLv2+ and BSD @@ -128,6 +128,9 @@ make check %{_datadir}/bash-completion %changelog +* 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 diff --git a/sources b/sources index 73062d9..7b1f513 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.5.tar.xz) = 7972dfd51c467492df0358a3886f61ca72fdb2bdfe67ec2de3aea47305ebfbcbdf5b8c35da8d43998dfa78e4aa170bd413498d26ac4360b488404a088ba2a808 +SHA512 (beaker-25.6.tar.xz) = f0654f62f8a1dadcbf84e09086d488bf4bcb0b6807ae6083bac1c96d5ee88dca428066b41ddebe045e0e779dc694f0f23e7bc613c4aa2df33210ff7352bcd236 From b83365e7f9bbc5683ded4dbc3af72589a66f56aa Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Fri, 2 Nov 2018 12:52:42 -0500 Subject: [PATCH 08/11] Upstream 26.0 BZ#1636072 --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index eae8a9f..2bca05f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ results_beaker /beaker-25.4.tar.xz /beaker-25.5.tar.xz /beaker-25.6.tar.xz +/beaker-26.0.tar.xz diff --git a/beaker.spec b/beaker.spec index 3eb6a0d..35f67da 100644 --- a/beaker.spec +++ b/beaker.spec @@ -10,7 +10,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 25.6 +Version: 26.0 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -128,6 +128,9 @@ make check %{_datadir}/bash-completion %changelog +* 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 diff --git a/sources b/sources index 7b1f513..739d95c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-25.6.tar.xz) = f0654f62f8a1dadcbf84e09086d488bf4bcb0b6807ae6083bac1c96d5ee88dca428066b41ddebe045e0e779dc694f0f23e7bc613c4aa2df33210ff7352bcd236 +SHA512 (beaker-26.0.tar.xz) = c880a88a1d383e643cf5b6dda4b757e74c886e44ea2adad38abffda2bb8988b57e5bbe1d1b38fa347ea1ddfa1aba85f355ab8f609d7ca439edad80bb9f5b5847 From 65844213f14b91e4da5b056178e12b181a808ba4 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Thu, 24 Jan 2019 22:58:24 -0600 Subject: [PATCH 09/11] New upstream 26.3 BZ1667496 --- .gitignore | 1 + beaker.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2bca05f..8556378 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ results_beaker /beaker-25.5.tar.xz /beaker-25.6.tar.xz /beaker-26.0.tar.xz +/beaker-26.3.tar.xz diff --git a/beaker.spec b/beaker.spec index 35f67da..ef87f55 100644 --- a/beaker.spec +++ b/beaker.spec @@ -10,7 +10,7 @@ %global upstream_name beaker Name: %{upstream_name} -Version: 26.0 +Version: 26.3 Release: 1%{?dist} Summary: Full-stack software and hardware integration testing system Group: Applications/Internet @@ -128,6 +128,9 @@ make check %{_datadir}/bash-completion %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 diff --git a/sources b/sources index 739d95c..c534384 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.0.tar.xz) = c880a88a1d383e643cf5b6dda4b757e74c886e44ea2adad38abffda2bb8988b57e5bbe1d1b38fa347ea1ddfa1aba85f355ab8f609d7ca439edad80bb9f5b5847 +SHA512 (beaker-26.3.tar.xz) = e8898cffc8a0ed5b1a94d3ec190fcf406fc1cbc4eec43601cbf1aaf97aacb496140545349ae7dc946bf0aaf4f486226bcac996b0d96637bd1336ea3183ea4335 From fe950df4f97b4a8c98d025e1c888fd3e064958e6 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sun, 24 Nov 2019 22:11:37 -0600 Subject: [PATCH 10/11] Upstream 26.6 --- .gitignore | 3 +++ beaker.spec | 6 ++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8556378..61e4f88 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,6 @@ results_beaker /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 diff --git a/beaker.spec b/beaker.spec index ef87f55..db19a1f 100644 --- a/beaker.spec +++ b/beaker.spec @@ -8,10 +8,12 @@ # 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: 26.3 -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 diff --git a/sources b/sources index c534384..bf092c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.3.tar.xz) = e8898cffc8a0ed5b1a94d3ec190fcf406fc1cbc4eec43601cbf1aaf97aacb496140545349ae7dc946bf0aaf4f486226bcac996b0d96637bd1336ea3183ea4335 +SHA512 (beaker-26.6-66-g03e169493.tar.gz) = 1b5686d2db9fad1c6530cbd268a2593d7ceae0e888fa521fd79903efaa62848e87b481bfb2b368bb38128ddd25b4aefb8c354b6d4f9ad83b8c352d982c9a0813 From 0062488a5cd88ac1cea416ec672f3f852d8d54a2 Mon Sep 17 00:00:00 2001 From: Gregory Hellings Date: Sun, 24 Nov 2019 22:30:05 -0600 Subject: [PATCH 11/11] Upstream 26.6 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 61e4f88..56d91c9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ results_beaker /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/sources b/sources index bf092c3..2d4dfde 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beaker-26.6-66-g03e169493.tar.gz) = 1b5686d2db9fad1c6530cbd268a2593d7ceae0e888fa521fd79903efaa62848e87b481bfb2b368bb38128ddd25b4aefb8c354b6d4f9ad83b8c352d982c9a0813 +SHA512 (beaker-26.6.tar.xz) = 43c75d5c524b0013e14e6f85ff0f1c2b4560b94dbed8ad48ac40fb264cd5e847bf1fce60c3101f9d9de25e8da273fde4d910cee649a1acea1e55227feb89cdca