diff --git a/nestos-installer.spec b/nestos-installer.spec index f843b75..6c568a0 100644 --- a/nestos-installer.spec +++ b/nestos-installer.spec @@ -9,7 +9,7 @@ Name: rust-nestos-installer Version: 0.20.0 -Release: 3 +Release: 4 Summary: Installer for NestOS License: Apache-2.0 @@ -30,7 +30,7 @@ NestOS is a Variant in openEuler from Fedora CoreOS. %description %{_description} -%package -n nestos-installer +%package -n %{crate} Summary: %{summary} License: ASL 2.0 and MIT and zlib @@ -47,12 +47,31 @@ Requires: util-linux # Obsolete dracut modules as they are not provided in this package. Obsoletes: nestos-installer-dracut < 0.0.1 -%description -n nestos-installer %{_description} +%description -n %{crate} %{_description} -%files -n nestos-installer +%files -n %{crate} %license LICENSE %doc README.* %{_bindir}/nestos-installer +%dir %{_datadir}/nestos-installer +%{_datadir}/nestos-installer/example-config.yaml + +%package -n %{crate}-bootinfra +Summary: %{crate} boot-time infrastructure for use on Fedora/RHEL CoreOS +Requires: %{crate}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +License: ASL 2.0 and MIT and zlib + +Provides: %{crate}-systemd = %{version}-%{release} +Obsoletes: %{crate}-systemd <= 0.3.0-3 + +%description -n %{crate}-bootinfra +This subpackage contains boot-time infrastructure for NestOS. It is not needed on other platforms. + +%files -n %{crate}-bootinfra +%{dracutlibdir}/modules.d/50rdcore/ +%{_libexecdir}/nestos-installer-* +%{_unitdir}/nestos-installer*.{service,target} +%{_systemdgeneratordir}/nestos-installer-generator %prep %autosetup -n %{crate}-v%{version} -p1 @@ -83,30 +102,17 @@ install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/nestos-installer-noreboot. install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/nestos-installer-pre.target install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/nestos-installer.target install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/nestos-installer-post.target +install -D -m 0644 -t %{buildroot}%{_datadir}/%{crate} data/example-config.yaml install -D -m 0755 -t %{buildroot}%{_systemdgeneratordir} systemd/nestos-installer-generator cp -r $RPM_BUILD_DIR/%{crate}-v%{version}/.cargo/bin %{buildroot}/usr mv %{buildroot}%{_bindir}/rdcore %{buildroot}%{dracutlibdir}/modules.d/50rdcore/ -%package -n nestos-installer-bootinfra -Summary: %{crate} boot-time infrastructure for use on Fedora/RHEL CoreOS -Requires: %{crate}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -License: ASL 2.0 and MIT and zlib - -Provides: %{crate}-systemd = %{version}-%{release} -Obsoletes: %{crate}-systemd <= 0.3.0-3 - -%description -n %{crate}-bootinfra -This subpackage contains boot-time infrastructure for NestOS. It is not needed on other platforms. - -%files -n %{crate}-bootinfra -%{dracutlibdir}/modules.d/* -%{_libexecdir}/* -%{_unitdir}/* -%{_systemdgeneratordir}/* - %changelog +* Thu Aug 15 2024 duyiwei - 0.20.0-4 +- add file example-config.yaml + * Fri May 24 2024 duyiwei - 0.20.0-3 - update patch 0001 to unsupport NestOS stream