rust-zincati-review.diff

rust-zincati-review.diff

--- a/rust-zincati.spec
+++ b/rust-zincati.spec
@@ -17,6 +17,7 @@ Source:         %{crates_source}
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
+BuildRequires:  systemd-rpm-macros
 
 %global _description %{expand:
 Update agent for Fedora CoreOS.}
@@ -32,6 +33,24 @@ Summary:        %{summary}
 %{_bindir}/zincati
 %doc README.md
 %license COPYRIGHT LICENSE
+%{_unitdir}/zincati.service
+%{_sysusersdir}/50-zincati.conf
+%dir %{_prefix}/lib/%{crate}/config.d
+%{_prefix}/lib/%{crate}/config.d/50-fedora-coreos-cincinnati.toml
+%dir /run/%{crate}/config.d
+%dir %{_sysconfdir}/%{crate}/config.d
+
+%pre         -n %{crate}
+%sysusers_create_package zincati 50-zincati.conf
+
+%post        -n %{crate}
+%systemd_post zincati.service
+
+%preun       -n %{crate}
+%systemd_preun zincati.service
+
+%postun      -n %{crate}
+%systemd_postun_with_restart zincati.service
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -45,6 +64,14 @@ Summary:        %{summary}
 
 %install
 %cargo_install
+%{__install} -Dpm0644 -t %{buildroot}%{_prefix}/lib/%{crate}/config.d \
+  dist/config.d/*.toml
+%{__mkdir_p} %{buildroot}/run/%{crate}/config.d
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/%{crate}/config.d
+%{__install} -Dpm0644 -t %{buildroot}%{_sysusersdir} \
+  dist/sysusers.d/*.conf
+%{__install} -Dpm0644 -t %{buildroot}%{_unitdir} \
+  dist/systemd/system/*.service
 
 %if %{with check}
 %check

--- a/rust-zincati.spec
+++ b/rust-zincati.spec
@@ -64,13 +64,13 @@ Summary:        %{summary}
 
 %install
 %cargo_install
-%{__install} -Dpm0644 -t %{buildroot}%{_prefix}/lib/%{crate}/config.d \
+install -Dpm0644 -t %{buildroot}%{_prefix}/lib/%{crate}/config.d \
   dist/config.d/*.toml
-%{__mkdir_p} %{buildroot}/run/%{crate}/config.d
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/%{crate}/config.d
-%{__install} -Dpm0644 -t %{buildroot}%{_sysusersdir} \
+mkdir -p %{buildroot}/run/%{crate}/config.d
+mkdir -p %{buildroot}%{_sysconfdir}/%{crate}/config.d
+install -Dpm0644 -t %{buildroot}%{_sysusersdir} \
   dist/sysusers.d/*.conf
-%{__install} -Dpm0644 -t %{buildroot}%{_unitdir} \
+install -Dpm0644 -t %{buildroot}%{_unitdir} \
   dist/systemd/system/*.service
 
 %if %{with check}