diff --git a/SPECS/rhc.spec b/SPECS/rhc.spec index 534480a..0433013 100644 --- a/SPECS/rhc.spec +++ b/SPECS/rhc.spec @@ -8,9 +8,9 @@ Name: rhc Version: 0.2.1 -Release: 3%{?dist} +Release: 5%{?dist} Epoch: 1 -Summary: Message dispatch agent for cloud-connected systems +Summary: rhc connects the system to Red Hat hosted services License: GPLv3 URL: https://github.com/redhatinsights/rhc @@ -31,13 +31,16 @@ Requires: insights-client BuildRequires: git BuildRequires: golang +BuildRequires: go-rpm-macros BuildRequires: dbus-devel BuildRequires: systemd-devel +%define _description %{expand:%{name} is a client tool and daemon that connects the system to Red Hat hosted +services enabling system and subscription management.} + %description -%{name} is pair of utilities that register systems with RHSM and establishes -a receiving queue for instructions to be sent to the system via a broker. +%{_description} %package devel @@ -46,8 +49,7 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %description devel -%{name} is pair of utilities that register systems with RHSM and establishes -a receiving queue for instructions to be sent to the system via a broker. +%{_description} This package includes files necessary for building rhc workers. @@ -76,6 +78,7 @@ cd %{_builddir}/%{name}/yggdrasil-worker-package-manager cd %{_builddir}/%{name}/%{name}-%{version} %patch1 -p1 + %build %set_build_flags export BUILDFLAGS="%{buildflags}" @@ -84,7 +87,7 @@ cd %{_builddir}/%{name}/yggdrasil-%{yggdrasil_ver} make %{makeflags} cd %{_builddir}/%{name}/yggdrasil-worker-package-manager -go build -o rhc-package-manager-worker -mod=vendor . +go build %{buildflags} -ldflags="%{goldflags}" -o rhc-package-manager-worker -mod vendor . cd %{_builddir}/%{name}/%{name}-%{version} make %{makeflags} @@ -128,6 +131,12 @@ make %{makeflags} \ %changelog +* Tue Mar 1 2022 Link Dupont - 0.2.1-5 +- Ensure worker is built with hardening compiler flags (RHBZ#2059471) + +* Tue Feb 22 2022 Link Dupont - 0.2.1-4 +- Update summary and description (RHBZ#2057029) + * Tue Feb 15 2022 Link Dupont - 0.2.1-3 - Include patch to collect and report errors during disconnect