Use systemd_sysusers_compat

- Resolves: rhbz#2312400

Upstream tag: v0.4.4
Upstream commit: 2a15f834

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -6,7 +6,3 @@
 /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

@@ -1,20 +1,17 @@
 # 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}
-
+upstream_project_url: https://github.com/RedhatInsights/yggdrasil
 jobs:
   - job: pull_from_upstream
     trigger: release
     dist_git_branches:
-      - fedora-all
+      - fedora-40
   - job: koji_build
     trigger: commit
     dist_git_branches:
-      - fedora-all
+      - fedora-40
   - job: bodhi_update
     trigger: commit
     dist_git_branches:
-      - fedora-branched
+      - fedora-40

go-vendor-tools.toml

@@ -1,8 +0,0 @@
-[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,2 +1 @@
-SHA512 (yggdrasil-0.4.10.tar.gz) = 7b9ee3ec204feeb635d7ff4c736d8b5f6ff468863ab456eea45481593a523d4711602b1ba0aef7a77d4a5886819e9791b7f54e7f0f9b30e89a34d0a7becb2bc5
-SHA512 (yggdrasil-0.4.10-vendor.tar.bz2) = 9752e2c5fefd2eee93848627f3f1a21a9a7a11b60971203532ecb936f2be53e51a0d7c7f254b35badec2e27e3005f2dd5a9cb1eb281cf65fb7dd7f0ed36ca983
+SHA512 (yggdrasil-0.4.4.tar.xz) = 138df3b4eeb4815fda5d7c60001d75a29596508c9c7de5a0e29aa4b54f4df73024e42cf26f8afcd19671a552199452c81d920873d839044ed1a7f509e6671875

yggdrasil.spec

@@ -1,41 +1,39 @@
-# Generated by go2rpm 1.19.0
-%bcond check 1
-
-%global go_vendor_license_check_disable %{defined rhel}
+%bcond_without check
 
 # https://github.com/redhatinsights/yggdrasil
 %global goipath         github.com/redhatinsights/yggdrasil
-Version:                0.4.10
+Version:                0.4.4
+%global tag             v%{version}
 
-%gometa -L -f
+%gometa -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
 
-# 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
+License:        GPL-3.0-only
 URL:            %{gourl}
-Source0:        %{gosource}
-# Generated by go-vendor-tools
-Source1:        %{archivename}-vendor.tar.bz2
-Source2:        go-vendor-tools.toml
-Source3:        yggdrasil.sysusers
+Source:         %{url}/releases/download/%{tag}/yggdrasil-%{version}.tar.xz
+Source1:        yggdrasil.sysusers
 
-BuildRequires:  go-vendor-tools
 BuildRequires:  systemd-rpm-macros
 BuildRequires:  meson
 BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(bash-completion)
+%{?sysusers_requires_compat}
 
 %{?systemd_requires}
 
-%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.
+%description %{common_description}
 
 %package devel
 Summary:        %{name} development files
@@ -45,41 +43,36 @@ 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 yggdrasil.
+%gopkg
 
 %prep
-%goprep -p1
-tar -xf %{S:1}
+%goprep %{?rhel:-k}
 
+%if %{undefined rhel}
 %generate_buildrequires
-%go_vendor_license_buildrequires -c %{S:2}
+%go_generate_buildrequires
+%endif
 
 %build
-%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}"'
+%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}"'
 %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
-install -d -m 0755 %{buildroot}%{_localstatedir}/lib/yggdrasil
-install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/yggdrasil.conf
+%gopkginstall
 
-%check
-%go_vendor_license_check -c %{S:2}
 %if %{with check}
-%gocheck2
+%check
+%gocheck
 %endif
 
+%pre
+%sysusers_create_compat %{SOURCE1}
+
 %post
 %systemd_post %{name}.service
 %systemd_user_post %{name}.service
@@ -92,37 +85,26 @@ install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysusersdir}/yggdrasil.conf
 %systemd_postun_with_restart %{name}.service
 %systemd_user_postun_with_restart %{name}.service
 
-%files -f %{go_vendor_license_filelist}
+%files
+%license LICENSE
+%if %{defined rhel}
+%license vendor/modules.txt
+%endif
 %doc CONTRIBUTING.md README.md
-%{_bindir}/yggd
-%{_bindir}/yggctl
+%{_bindir}/*
 %config(noreplace) %{_sysconfdir}/%{name}
-%{_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
+%{_unitdir}/*
+%{_userunitdir}/*
+%{_sysusersdir}/*
+%{_datadir}/bash-completion/completions/*
+%{_datadir}/dbus-1/{interfaces,system-services,system.d}/*
+%{_datadir}/doc/%{name}/*
+%{_mandir}/man1/*
 
 %files devel
-%{_libdir}/pkgconfig/yggdrasil.pc
+%{_libdir}/pkgconfig/*.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
+%gopkgfiles
 
 %changelog
 %autochangelog