Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Resolves: rhbz#2481490

.gitignore

@@ -3,3 +3,10 @@
 /yggdrasil-0.3.2.tar.gz
 /yggdrasil-0.3.2.tar.xz
 /yggdrasil-0.4.1.tar.xz
+/yggdrasil-0.4.2.tar.xz
+/yggdrasil-0.4.3.tar.xz
+/yggdrasil-0.4.4.tar.xz
+/yggdrasil-0.4.9.tar.gz
+/yggdrasil-0.4.9-vendor.tar.bz2
+/yggdrasil-0.4.10.tar.gz
+/yggdrasil-0.4.10-vendor.tar.bz2

.packit.yaml

@@ -0,0 +1,20 @@
+# See the documentation for more information:
+# https://packit.dev/docs/configuration/
+
+upstream_project_url: https://github.com/RedHatInsights/yggdrasil
+issue_repository: https://github.com/RedHatInsights/yggdrasil
+upstream_tag_template: v{version}
+
+jobs:
+  - job: pull_from_upstream
+    trigger: release
+    dist_git_branches:
+      - fedora-all
+  - job: koji_build
+    trigger: commit
+    dist_git_branches:
+      - fedora-all
+  - job: bodhi_update
+    trigger: commit
+    dist_git_branches:
+      - fedora-branched

README.packit

@@ -0,0 +1,3 @@
+This repository is maintained by packit.
+https://packit.dev/
+The file was generated using packit 0.101.0.

go-vendor-tools.toml

@@ -0,0 +1,8 @@
+[archive]
+
+[licensing]
+detector = "askalono"
+[[licensing.licenses]]
+path = "vendor/gopkg.in/yaml.v3/LICENSE"
+sha256sum = "d18f6323b71b0b768bb5e9616e36da390fbd39369a81807cca352de4e4e6aa0b"
+expression = "MIT AND (MIT AND Apache-2.0)"

sources

@@ -1 +1,2 @@
-SHA512 (yggdrasil-0.4.1.tar.xz) = 0329b969b7441363cf376cd8b9adf163e0d7f9ecf89db54128a3d8062c887676ac9903e911397bb6eef84238423705352138e0ff1d1ceec0d088c0514222a2f0
+SHA512 (yggdrasil-0.4.10.tar.gz) = 7b9ee3ec204feeb635d7ff4c736d8b5f6ff468863ab456eea45481593a523d4711602b1ba0aef7a77d4a5886819e9791b7f54e7f0f9b30e89a34d0a7becb2bc5
+SHA512 (yggdrasil-0.4.10-vendor.tar.bz2) = 9752e2c5fefd2eee93848627f3f1a21a9a7a11b60971203532ecb936f2be53e51a0d7c7f254b35badec2e27e3005f2dd5a9cb1eb281cf65fb7dd7f0ed36ca983

yggdrasil.spec

@@ -1,80 +1,128 @@
-%bcond_without check
+# Generated by go2rpm 1.19.0
+%bcond check 1
+
+%global go_vendor_license_check_disable %{defined rhel}
 
 # https://github.com/redhatinsights/yggdrasil
 %global goipath         github.com/redhatinsights/yggdrasil
-Version:                0.4.1
-%global tag             %{version}
+Version:                0.4.10
 
-%gometa -f
+%gometa -L -f
 
-%global common_description %{expand:
-yggdrasil is a system daemon that subscribes to topics on an MQTT broker and
-routes any data received on the topics to an appropriate child "worker" process,
-exchanging data with its worker processes through a D-Bus message broker.}
-
-%global golicenses      LICENSE
-%global godocs          CONTRIBUTING.md README.md
 
 Name:           yggdrasil
 Release:        %autorelease
 Summary:        Remote data transmission and processing client
 
-License:        GPL-3.0-only
+# Generated by go-vendor-tools
+License:        Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND EPL-2.0 AND GPL-3.0-only AND MIT
 URL:            %{gourl}
-Source:         %{url}/releases/download/%{version}/yggdrasil-%{version}.tar.xz
+Source0:        %{gosource}
+# Generated by go-vendor-tools
+Source1:        %{archivename}-vendor.tar.bz2
+Source2:        go-vendor-tools.toml
+Source3:        yggdrasil.sysusers
 
+BuildRequires:  go-vendor-tools
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  meson
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(bash-completion)
 
-%description %{common_description}
+%{?systemd_requires}
 
-%gopkg
+%description
+yggdrasil is a system daemon that subscribes to topics on an MQTT broker and
+routes any data received on the topics to an appropriate child "worker" process,
+exchanging data with its worker processes through a D-Bus message broker.
+
+%package devel
+Summary:        %{name} development files
+
+%description devel
+%{common_description}
+
+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 yggdrasil.
 
 %prep
-%goprep %{?rhel:-k}
-%autopatch -p1
+%goprep -p1
+tar -xf %{S:1}
 
-%if %{undefined rhel}
 %generate_buildrequires
-%go_generate_buildrequires
-%endif
+%go_vendor_license_buildrequires -c %{S:2}
 
 %build
-%undefine _auto_set_build_flags
-export %gomodulesmode
-%{?gobuilddir:export GOPATH="%{gobuilddir}:${GOPATH:+${GOPATH}:}%{?gopath}"}
-%meson "-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}"'
+%global gomodulesmode GO111MODULE=on
+%meson -Dexamples=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
 
 %global gosupfiles ./ipc/com.redhat.Yggdrasil1.Dispatcher1.xml ./ipc/com.redhat.Yggdrasil1.Worker1.xml
 %install
+%go_vendor_license_install -c %{S:2}
 %meson_install
-%gopkginstall
+install -d -m 0755 %{buildroot}%{_localstatedir}/lib/yggdrasil
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/yggdrasil.conf
 
-%if %{with check}
 %check
-%gocheck
+%go_vendor_license_check -c %{S:2}
+%if %{with check}
+%gocheck2
 %endif
 
-%files
-%license LICENSE
-%if %{defined rhel}
-%license vendor/modules.txt
-%endif
+%post
+%systemd_post %{name}.service
+%systemd_user_post %{name}.service
+
+%preun
+%systemd_preun %{name}.service
+%systemd_user_preun %{name}.service
+
+%postun
+%systemd_postun_with_restart %{name}.service
+%systemd_user_postun_with_restart %{name}.service
+
+%files -f %{go_vendor_license_filelist}
 %doc CONTRIBUTING.md README.md
-%{_bindir}/*
+%{_bindir}/yggd
+%{_bindir}/yggctl
 %config(noreplace) %{_sysconfdir}/%{name}
-%{_unitdir}/*
-%{_userunitdir}/*
-%{_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
 
-%gopkgfiles
+%files devel
+%{_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

yggdrasil.sysusers

@@ -0,0 +1,4 @@
+#Type Name               ID   GECOS                   Home directory    Shell
+u     yggdrasil          -    "yggdrasil system user" /var/lib/yggdrasil -
+u     yggdrasil-worker   -    "yggdrasil worker user" -                  -
+m     yggdrasil          yggdrasil-worker