Create rhcd.service sym link to yggdrasil.service

Resolves: RHEL-82890

.gitignore

@@ -5,3 +5,4 @@
 /yggdrasil-0.4.1.tar.xz
 /yggdrasil-0.4.2.tar.xz
 /yggdrasil-0.4.4.tar.xz
+/yggdrasil-0.4.5.tar.xz

sources

@@ -1 +1 @@
-SHA512 (yggdrasil-0.4.4.tar.xz) = 138df3b4eeb4815fda5d7c60001d75a29596508c9c7de5a0e29aa4b54f4df73024e42cf26f8afcd19671a552199452c81d920873d839044ed1a7f509e6671875
+SHA512 (yggdrasil-0.4.5.tar.xz) = 26c688a6b776fbd574b601a16d1816c167d04103851365ac7ec1da4fe06e1d61190d68e2df5f7f58d31a0b5c167686bef2594f3cae97516ac3f6cc21db28f14c

yggdrasil.spec

@@ -2,7 +2,7 @@
 
 # https://github.com/redhatinsights/yggdrasil
 %global goipath         github.com/redhatinsights/yggdrasil
-Version:                0.4.4
+Version:                0.4.5
 %global tag             v%{version}
 
 %gometa -f
@@ -42,6 +42,16 @@ Summary:        %{name} development files
 
 Contains files needed for yggdrasil worker development.
 
+%package examples
+Summary:        %{name} example workers
+
+Requires: %{name} = %{version}-%{release}
+
+%description examples
+%{common_description}
+
+Contains example workers for %{name}.
+
 %gopkg
 
 %prep
@@ -57,7 +67,7 @@ Contains files needed for yggdrasil worker development.
 %undefine _auto_set_build_flags
 export %gomodulesmode
 %{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"}
-%meson -Dvendor=True -Ddefault_data_host=cert.cloud.redhat.com -Ddefault_path_prefix=redhat/insights "-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 -Dexamples=True -Dvendor=True -Ddefault_data_host=cert.cloud.redhat.com -Ddefault_path_prefix=redhat/insights "-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
 
 %global gosupfiles ./ipc/com.redhat.Yggdrasil1.Dispatcher1.xml ./ipc/com.redhat.Yggdrasil1.Worker1.xml
@@ -65,6 +75,7 @@ export %gomodulesmode
 %meson_install
 %__install -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/config.toml
 %__install -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysusersdir}/%{name}.conf
+%__install -d -m 0755 %{buildroot}%{_localstatedir}/lib/yggdrasil
 
 %if %{with check}
 %check
@@ -75,6 +86,7 @@ export %gomodulesmode
 %sysusers_create_compat %{SOURCE2}
 
 %post
+ln -s %{_unitdir}/yggdrasil.service %{_unitdir}/rhcd.service
 %systemd_post %{name}.service
 %systemd_user_post %{name}.service
 
@@ -83,6 +95,7 @@ export %gomodulesmode
 %systemd_user_preun %{name}.service
 
 %postun
+rm -f %{_unitdir}/rhcd.service
 %systemd_postun_with_restart %{name}.service
 %systemd_user_postun_with_restart %{name}.service
 
@@ -92,18 +105,35 @@ export %gomodulesmode
 %license vendor/modules.txt
 %endif
 %doc CONTRIBUTING.md README.md
-%{_bindir}/*
+%{_bindir}/yggd
+%{_bindir}/yggctl
 %config(noreplace) %{_sysconfdir}/%{name}
-%{_unitdir}/*
-%{_userunitdir}/*
-%{_sysusersdir}/*
-%{_datadir}/bash-completion/completions/*
-%{_datadir}/dbus-1/{interfaces,system-services,system.d}/*
-%{_datadir}/doc/%{name}/*
-%{_mandir}/man1/*
+%{_unitdir}/yggdrasil-bus@.service
+%{_unitdir}/yggdrasil-bus@.socket
+%{_unitdir}/yggdrasil@.service
+%{_unitdir}/yggdrasil.service
+%{_userunitdir}/yggdrasil.service
+%{_sysusersdir}/yggdrasil.conf
+%{_datadir}/bash-completion/completions/yggd
+%{_datadir}/bash-completion/completions/yggctl
+%{_datadir}/dbus-1/interfaces/com.redhat.Yggdrasil1.xml
+%{_datadir}/dbus-1/interfaces/com.redhat.Yggdrasil1.Worker1.xml
+%{_datadir}/dbus-1/interfaces/com.redhat.Yggdrasil1.Dispatcher1.xml
+%{_datadir}/dbus-1/system.d/yggd.conf
+%{_datadir}/dbus-1/system-services/com.redhat.Yggdrasil1.service
+%{_datadir}/doc/%{name}/tags.toml
+%{_mandir}/man1/yggctl.1.gz
+%{_mandir}/man1/yggd.1.gz
+%attr(0755, yggdrasil, yggdrasil) %{_localstatedir}/lib/yggdrasil
 
 %files devel
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/yggdrasil.pc
+
+%files examples
+%{_libexecdir}/yggdrasil/echo
+%{_datadir}/dbus-1/system.d/com.redhat.Yggdrasil1.Worker1.echo.conf
+%{_datadir}/dbus-1/system-services/com.redhat.Yggdrasil1.Worker1.echo.service
+%{_unitdir}/com.redhat.Yggdrasil1.Worker1.echo.service
 
 %changelog
 %autochangelog