diff --git a/.gitignore b/.gitignore index 6f72c72..1e87080 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -SOURCES/rhc-0.2.4.tar.gz -SOURCES/yggdrasil-0.2.4.tar.gz -SOURCES/yggdrasil-worker-package-manager-0.1.3.tar.xz +SOURCES/rhc-0.3.0.tar.xz diff --git a/.rhc.metadata b/.rhc.metadata index 644febf..1b4b4a4 100644 --- a/.rhc.metadata +++ b/.rhc.metadata @@ -1,3 +1 @@ -d86980ee8506b164209dbd991df36199922d8592 SOURCES/rhc-0.2.4.tar.gz -4fca792b47a5dea8d3f12df8ea7f4ab6763d2be9 SOURCES/yggdrasil-0.2.4.tar.gz -307a2ca145c93b20c41b7f802f5b6fcf61dff3ae SOURCES/yggdrasil-worker-package-manager-0.1.3.tar.xz +b3ceab63f21d78da6962287cd0abecf80a5bb9a1 SOURCES/rhc-0.3.0.tar.xz diff --git a/SOURCES/config.toml b/SOURCES/config.toml deleted file mode 100644 index 5e34c30..0000000 --- a/SOURCES/config.toml +++ /dev/null @@ -1,6 +0,0 @@ -# rhc global configuration settings - -broker = ["wss://connect.cloud.redhat.com:443"] -cert-file = "/etc/pki/consumer/cert.pem" -key-file = "/etc/pki/consumer/key.pem" -log-level = "error" diff --git a/SOURCES/rhc-package-manager.toml b/SOURCES/rhc-package-manager.toml deleted file mode 100644 index 1abdda4..0000000 --- a/SOURCES/rhc-package-manager.toml +++ /dev/null @@ -1,5 +0,0 @@ -# regular expression patterns to allow package operations -allow-pattern = ["^rhc-worker-playbook$"] - -# log verbosity level (error (default), warn, info, debug, trace) -log-level = "error" diff --git a/SPECS/rhc.spec b/SPECS/rhc.spec index ee4f623..2b3fa2f 100644 --- a/SPECS/rhc.spec +++ b/SPECS/rhc.spec @@ -1,139 +1,139 @@ -%global buildflags -buildmode pie -compiler gc -a -v -x -%global goldflags %{expand:-linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'} +## START: Set by rpmautospec +## (rpmautospec version 0.6.5) +## RPMAUTOSPEC: autorelease, autochangelog +%define autorelease(e:s:pb:n) %{?-p:0.}%{lua: + release_number = 1; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + +%bcond_without check + +# https://github.com/redhatinsights/rhc +%global goipath github.com/redhatinsights/rhc +Version: 0.3.0 +%global tag v%{version} + +%gometa -f + +%global golicenses LICENSE +%global godocs CONTRIBUTING.md README.md -%global yggdrasil_ver 0.2.4 -%global ygg_pkg_mgr_ver 0.1.3 Name: rhc -Version: 0.2.4 -Release: 6%{?dist} +Release: %autorelease Epoch: 1 Summary: rhc connects the system to Red Hat hosted services -License: GPLv3 -URL: https://github.com/redhatinsights/rhc - -Source0: https://github.com/RedHatInsights/rhc/releases/download/%{version}/%{name}-%{version}.tar.gz -Source1: config.toml -Source2: https://github.com/RedHatInsights/yggdrasil/releases/download/%{yggdrasil_ver}/yggdrasil-%{yggdrasil_ver}.tar.gz -Source3: https://github.com/RedHatInsights/yggdrasil-worker-package-manager/releases/download/%{ygg_pkg_mgr_ver}/yggdrasil-worker-package-manager-%{ygg_pkg_mgr_ver}.tar.xz -Source4: rhc-package-manager.toml - -ExclusiveArch: %{go_arches} +License: GPL-3.0-only +URL: %{gourl} -Recommends: insights-client +Source: %{url}/releases/download/%{tag}/%{name}-%{version}.tar.xz -Requires: subscription-manager -Requires(post): policycoreutils-python-utils +Recommends: insights-client -BuildRequires: git -BuildRequires: golang -BuildRequires: go-rpm-macros -BuildRequires: dbus-devel -BuildRequires: systemd +Requires: subscription-manager +Requires: yggdrasil >= 0.4 +Requires: yggdrasil-worker-package-manager +Requires(post): policycoreutils-python-utils +BuildRequires: git-core +BuildRequires: golang +BuildRequires: go-rpm-macros +BuildRequires: meson +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(bash-completion) -%define _description %{expand:%{name} is a client tool and daemon that connects the system to Red Hat hosted +%global common_description %{expand: +%{name} is a client tool and daemon that connects the system to Red Hat hosted services enabling system and subscription management.} %description -%{_description} +%{common_description} +%package compat +Summary: Transition package to support migrating from rhcd to yggd +Requires: yggdrasil >= 0.4.2 +Recommends: rhc -%package devel -Summary: Development files for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} - - -%description devel -%{_description} - -This package includes files necessary for building rhc workers. - - -%global makeflags %{expand:PREFIX=%{_prefix} \\ - SYSCONFDIR=%{_sysconfdir} \\ - LOCALSTATEDIR=%{_localstatedir} \\ - SHORTNAME=%{name} \\ - LONGNAME=%{name} \\ - PKGNAME=%{name} \\ - 'BRANDNAME=Remote Host Configuration' \\ - TOPICPREFIX=redhat/insights \\ - VERSION=%{version} \\ - DATAHOST=cert.cloud.redhat.com \\ - 'PROVIDER=Red Hat'} +%description compat +%{common_description} +Transition package to support migrating from rhcd to yggd. %prep -%setup -T -D -c -n %{name} -a 0 -%setup -T -D -c -n %{name} -a 2 -%setup -T -D -c -n %{name} -a 3 -sed -i -e "s/LDFLAGS :=/LDFLAGS ?=/" %{_builddir}/%{name}/yggdrasil-%{yggdrasil_ver}/Makefile -sed -i -e "s/LDFLAGS :=/LDFLAGS ?=/" %{_builddir}/%{name}/%{name}-%{version}/Makefile +%goprep %{?rhel:-k} +%autopatch -p1 +%if %{undefined rhel} +%generate_buildrequires +%go_generate_buildrequires +%endif %build -%set_build_flags -export BUILDFLAGS="%{buildflags}" -export LDFLAGS="%{goldflags}" -cd %{_builddir}/%{name}/yggdrasil-%{yggdrasil_ver} -make %{makeflags} - -cd %{_builddir}/%{name}/yggdrasil-worker-package-manager-%{ygg_pkg_mgr_ver} -go build %{buildflags} -ldflags="%{goldflags} -X 'github.com/redhatinsights/yggdrasil.SysconfDir=%{_sysconfdir}' -X 'github.com/redhatinsights/yggdrasil.LongName=%{name}'" -o rhc-package-manager-worker -mod vendor . - -cd %{_builddir}/%{name}/%{name}-%{version} -make %{makeflags} - +%undefine _auto_set_build_flags +export %gomodulesmode +%{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"} +%meson -Dvendor=True "-Dgobuildflags=[%(echo %{expand:%gocompilerflags} | sed -e s/"^"/"'"/ -e s/" "/"', '"/g -e s/"$"/"'"/), '-tags', '"rpm_crashtraceback\ ${BUILDTAGS:-}"', '-a', '-v', '-x']" -Dgoldflags='%{?currentgoldflags} -B 0x%(head -c20 /dev/urandom|od -An -tx1|tr -d " \n") -compressdwarf=false -linkmode=external -extldflags "%{build_ldflags} %{?__golang_extldflags}"' +%meson_build %install -%set_build_flags -export BUILDFLAGS="%{buildflags}" -export LDFLAGS="%{goldflags}" -cd %{_builddir}/%{name}/yggdrasil-%{yggdrasil_ver} -make %{makeflags} \ - DESTDIR=%{buildroot} \ - install - -%{__install} -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/ - -cd %{_builddir}/%{name}/yggdrasil-worker-package-manager-%{ygg_pkg_mgr_ver} -%{__install} -D -m 755 rhc-package-manager-worker %{buildroot}%{_libexecdir}/%{name}/ -%{__install} -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/workers/rhc-package-manager.toml - -cd %{_builddir}/%{name}/%{name}-%{version} -make %{makeflags} \ - DESTDIR=%{buildroot} \ - install +%meson_install +install --directory %{buildroot}%{_unitdir} +install --directory %{buildroot}%{_sysconfdir}/rhc +ln -sf yggdrasil.service %{buildroot}%{_unitdir}/rhcd.service +ln -sf ../yggdrasil/config.toml %{buildroot}%{_sysconfdir}/rhc/config.toml +%if %{with check} +%check +%gocheck +%endif %post /usr/sbin/semanage permissive --add rhcd_t || true +%systemd_post rhc-canonical-facts.timer +if [ $1 -eq 1 ]; then + systemctl daemon-reload + systemctl start rhc-canonical-facts.timer +fi +%preun +%systemd_preun rhc-canonical-facts.timer %postun if [ $1 -eq 0 ]; then /usr/sbin/semanage permissive --delete rhcd_t || true fi - +%systemd_postun_with_restart rhc-canonical-facts.timer +if [ $1 -eq 0 ]; then + systemctl daemon-reload +fi %files -%doc %{name}-%{version}/README.md yggdrasil-%{yggdrasil_ver}/doc/tags.toml -%{_bindir}/%{name} -%{_sbindir}/%{name}d -%config(noreplace) %{_sysconfdir}/%{name}/config.toml -%config(noreplace) %{_sysconfdir}/%{name}/workers/rhc-package-manager.toml -%{_unitdir}/%{name}d.service +%license LICENSE +%doc CONTRIBUTING.md README.md +%{_bindir}/* %{_datadir}/bash-completion/completions/* %{_mandir}/man1/* -%{_libexecdir}/%{name} +%{_unitdir}/rhc-canonical-facts.* +%{_presetdir}/* +%files compat +%{_unitdir}/rhcd.service +%{_sysconfdir}/rhc/config.toml -%files devel -%{_prefix}/share/pkgconfig/%{name}.pc +%changelog +## START: Generated by rpmautospec +* Mon Dec 02 2024 Link Dupont - 1:0.3.0-1 +- Update to 0.3.0 (RHEL-69743) +* Tue Oct 29 2024 Troy Dawson - 1:0.2.4-7 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -%changelog -* Fri Oct 25 2024 MSVSphere Packaging Team - 1:0.2.4-6 +* Fri Oct 25 2024 MSVSphere Packaging Team - 0.2.4-6 - Rebuilt for MSVSphere 10 * Tue May 21 2024 Link Dupont - 0.2.4-6 @@ -262,3 +262,5 @@ fi * Fri Feb 12 2021 Link Dupont - 0.1-1 - Initial release + +## END: Generated by rpmautospec