Use vendored dependencies in RHEL builds

The upstream release tarballs include the vendored dependencies. In
Fedora builds, %goprep will remove them and still use dynamic
buildrequires, but RHEL does not package those and needs to use the
vendoring.
This commit is contained in:
Yaakov Selkowitz 2023-08-09 10:25:42 -04:00
parent 553f11d596
commit 4d20229376
3 changed files with 9 additions and 3 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/yggdrasil-worker-package-manager-0.2.0.tar.gz /yggdrasil-worker-package-manager-0.2.0.tar.gz
/yggdrasil-worker-package-manager-0.2.0.tar.xz

View File

@ -1 +1 @@
SHA512 (yggdrasil-worker-package-manager-0.2.0.tar.gz) = da1e015bcecca9d870eb1bf3cb37ed41a8bf02d7de3baf9b91c4fccdf27ea95681700bbb37828770479cce5b193b84335ab4a031e2552d6f9ecdc5596c45c5ab SHA512 (yggdrasil-worker-package-manager-0.2.0.tar.xz) = 67e6a7152cf105f8a5593cb47e86be46419291f580fb98a9407bb82b67046288884cb5cf28b55ef0224bfb5f5ce63c636b9bb5f7b7da93828501f0a3af5219eb

View File

@ -23,7 +23,7 @@ Summary: Package manager worker for yggdrasil
License: GPL-3.0-only License: GPL-3.0-only
URL: %{gourl} URL: %{gourl}
Source: %{gosource} Source: %{url}/releases/download/%{version}/%{name}-%{version}.tar.xz
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: meson BuildRequires: meson
@ -34,11 +34,13 @@ BuildRequires: pkgconfig(dbus-1)
%gopkg %gopkg
%prep %prep
%goprep %goprep %{?rhel:-k}
%autopatch -p1 %autopatch -p1
%if %{undefined rhel}
%generate_buildrequires %generate_buildrequires
%go_generate_buildrequires %go_generate_buildrequires
%endif
%build %build
%undefine _auto_set_build_flags %undefine _auto_set_build_flags
@ -58,6 +60,9 @@ export %gomodulesmode
%files %files
%license LICENSE %license LICENSE
%if %{defined rhel}
%license vendor/modules.txt
%endif
%doc README.md %doc README.md
%{_libexecdir}/* %{_libexecdir}/*
%config(noreplace) %{_sysconfdir}/%{name} %config(noreplace) %{_sysconfdir}/%{name}