chore: remove go-vendor-tools.conf from spec

.packit.yaml

@@ -8,7 +8,6 @@ merge_pr_in_ci: false
 files_to_sync:
   - src:
       - "build/package/rpm/go-fdo-server.spec"
-      - "build/package/rpm/go-vendor-tools.toml"
       - "build/package/rpm/go-fdo-server-group.conf"
       - "build/package/rpm/go-fdo-server-*-user.conf"
       - "build/package/rpm/go-fdo-server-*-vendor.tar.bz2"

build/package/rpm/go-fdo-server.spec

@@ -20,13 +20,12 @@ URL:            %{gourl}
 Source0:        %{gosource}
 # Generated by go-vendor-tools
 Source1:        %{archivename}-vendor.tar.bz2
-Source2:        go-vendor-tools.toml
-# sysusers.d files are required to be part of the sources
-# we cannot copy/install them in the install section
-Source3:        go-fdo-server-group.conf
-Source4:        go-fdo-server-manufacturer-user.conf
-Source5:        go-fdo-server-rendezvous-user.conf
-Source6:        go-fdo-server-owner-user.conf
+# Per packaging guidelines, sysusers.d files must be included as sources
+# and cannot be installed directly in the install section.
+Source2:        go-fdo-server-group.conf
+Source3:        go-fdo-server-manufacturer-user.conf
+Source4:        go-fdo-server-rendezvous-user.conf
+Source5:        go-fdo-server-owner-user.conf
 
 BuildRequires:  go-rpm-macros
 # Systemd units
@@ -56,10 +55,10 @@ install -m 0755 -vp -s %{gobuilddir}/bin/* %{buildroot}%{_bindir}
 # Configuration dir
 install -m 0755 -vd %{buildroot}%{_sysconfdir}/%{name}
 # Sysusers
-install -m 0644 -vp -D %{SOURCE3} %{buildroot}/%{_sysusersdir}/go-fdo-server.conf
-install -m 0644 -vp -D %{SOURCE4} %{buildroot}/%{_sysusersdir}/go-fdo-server-manufacturer.conf
-install -m 0644 -vp -D %{SOURCE5} %{buildroot}/%{_sysusersdir}/go-fdo-server-rendezvous.conf
-install -m 0644 -vp -D %{SOURCE6} %{buildroot}/%{_sysusersdir}/go-fdo-server-owner.conf
+install -m 0644 -vp -D %{SOURCE2} %{buildroot}/%{_sysusersdir}/go-fdo-server.conf
+install -m 0644 -vp -D %{SOURCE3} %{buildroot}/%{_sysusersdir}/go-fdo-server-manufacturer.conf
+install -m 0644 -vp -D %{SOURCE4} %{buildroot}/%{_sysusersdir}/go-fdo-server-rendezvous.conf
+install -m 0644 -vp -D %{SOURCE5} %{buildroot}/%{_sysusersdir}/go-fdo-server-owner.conf
 # Sysconfig files
 install -m 0755 -vd %{buildroot}%{_sysconfdir}/sysconfig
 install -m 0644 -vp -D configs/sysconfig/* %{buildroot}%{_sysconfdir}/sysconfig/
@@ -89,7 +88,7 @@ install -m 0755 -vp -D scripts/* %{buildroot}%{_datadir}/%{name}
 %{_datadir}/%{name}/generate-owner-certs.sh
 
 %pre
-%sysusers_create_compat %{SOURCE3}
+%sysusers_create_compat %{SOURCE2}
 
 %package manufacturer
 Requires: go-fdo-server
@@ -109,7 +108,7 @@ preparing devices for the on-boarding process during the manufacturing phase.
 # Sysuser
 %{_sysusersdir}/go-fdo-server-manufacturer.conf
 %pre manufacturer
-%sysusers_create_compat %{SOURCE4}
+%sysusers_create_compat %{SOURCE3}
 
 %post manufacturer
 %systemd_post go-fdo-server-manufacturer.service
@@ -138,7 +137,7 @@ voucher.
 # Sysuser
 %{_sysusersdir}/go-fdo-server-rendezvous.conf
 %pre rendezvous
-%sysusers_create_compat %{SOURCE5}
+%sysusers_create_compat %{SOURCE4}
 
 %post rendezvous
 %systemd_post go-fdo-server-rendezvous.service
@@ -167,7 +166,7 @@ necessary credentials and configuration for operation.
 # Sysuser
 %{_sysusersdir}/go-fdo-server-owner.conf
 %pre owner
-%sysusers_create_compat %{SOURCE6}
+%sysusers_create_compat %{SOURCE5}
 
 %post owner
 %systemd_post go-fdo-server-owner.service