diff --git a/.gitignore b/.gitignore index b5cae4f..fa71979 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zram-generator-0.3.0-rc.1.crate /zram-generator-0.3.1.crate /zram-generator-0.3.2.crate +/zram-generator-1.0.1.crate diff --git a/rust-zram-generator.spec b/rust-zram-generator.spec index a5f21c3..bd6cd24 100644 --- a/rust-zram-generator.spec +++ b/rust-zram-generator.spec @@ -1,10 +1,10 @@ -# Generated by rust2rpm 17 +# Generated by rust2rpm 18 %bcond_without check %global crate zram-generator Name: rust-%{crate} -Version: 0.3.2 +Version: 1.0.1 Release: %autorelease Summary: Systemd unit generator for zram swap devices @@ -13,9 +13,6 @@ License: MIT URL: https://crates.io/crates/zram-generator Source: %{crates_source} Source1: zram-generator.conf -# Initial patched metadata -# * allow building against rust-ini 0.17 -Patch0: zram-generator-fix-metadata.diff ExclusiveArch: %{rust_arches} %if %{__cargo_skip_build} @@ -104,20 +101,19 @@ echo 'systemd-rpm-macros' %build export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} +export LC_ALL=C.UTF-8 %cargo_build -make systemd_service SYSTEMD_SYSTEM_UNIT_DIR=%{_unitdir} SYSTEMD_SYSTEM_GENERATOR_DIR=%{_systemdgeneratordir} -LC_ALL=C.UTF-8 ronn --roff --organization="zram-generator %{version_no_tilde}" man/*.md +%make_build SYSTEMD_SYSTEM_UNIT_DIR=%{_unitdir} SYSTEMD_SYSTEM_GENERATOR_DIR=%{_systemdgeneratordir} \ + systemd-service man %install export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} %cargo_install -mkdir -p %{buildroot}%{_systemdgeneratordir} -mv -v %{buildroot}%{_bindir}/zram-generator %{buildroot}%{_systemdgeneratordir}/ -install -Dpm0644 -t %{buildroot}%{_unitdir} units/systemd-zram-setup@.service +rm %{buildroot}%{_bindir}/zram-generator +%make_install SYSTEMD_SYSTEM_UNIT_DIR=%{_unitdir} SYSTEMD_SYSTEM_GENERATOR_DIR=%{_systemdgeneratordir} + install -Dpm0644 -t %{buildroot}%{_prefix}/lib/systemd %{SOURCE1} -install -Dpm0644 -t %{buildroot}%{_mandir}/man8 man/zram-generator.8 -install -Dpm0644 -t %{buildroot}%{_mandir}/man5 man/zram-generator.conf.5 %if %{with check} %check diff --git a/sources b/sources index f1a774d..b5ddea5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zram-generator-0.3.2.crate) = e16effd58c6e4a91d877316e7ee000d36be6d9ce2d054804794c218cd87feb162179e73daa03e9570338796ea6ffe63a16720a1f2057cee2de616aa00a93311f +SHA512 (zram-generator-1.0.1.crate) = c3a6dfebdd954443e9d6c36a401f7ca24e1125653f49b29e70641f5f55773a732679b493be5a0fb52e68731adb26cb574a0b5aa315e9f1116daef7097e245946 diff --git a/zram-generator-fix-metadata.diff b/zram-generator-fix-metadata.diff deleted file mode 100644 index 657d064..0000000 --- a/zram-generator-fix-metadata.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- zram-generator-0.3.2/Cargo.toml 1970-01-01T00:00:00+00:00 -+++ zram-generator-0.3.2/Cargo.toml 2021-05-27T19:27:06.480757+00:00 -@@ -35,7 +35,7 @@ - features = ["std"] - - [dependencies.rust-ini] --version = ">=0.13, <0.17" -+version = ">=0.13, <0.18" - [dev-dependencies.fs_extra] - version = "1.1" -