From 17f8e499f493e4abe599bc56f1657660ed297847 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 29 Mar 2021 07:30:20 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/rust-zram-generator.git#54d85c68335a642c4c939b94ebd9ab00cd5aec56 --- rust-zram-generator.spec | 17 +++++++++++------ zram-generator.conf | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/rust-zram-generator.spec b/rust-zram-generator.spec index e507370..6ed3e43 100644 --- a/rust-zram-generator.spec +++ b/rust-zram-generator.spec @@ -5,7 +5,7 @@ Name: rust-%{crate} Version: 0.3.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Systemd unit generator for zram swap devices # Upstream license specification: MIT @@ -97,17 +97,16 @@ cp -a %{S:1} . %cargo_generate_buildrequires echo '/usr/bin/make' echo '/usr/bin/ronn' -echo 'pkgconfig(systemd)' echo 'systemd-rpm-macros' %build -export SYSTEMD_UTIL_DIR=$(pkg-config --variable=systemdutildir systemd) +export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} %cargo_build -make systemd_service +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 %install -export SYSTEMD_UTIL_DIR=$(pkg-config --variable=systemdutildir systemd) +export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} %cargo_install mkdir -p %{buildroot}%{_systemdgeneratordir} @@ -119,11 +118,17 @@ install -Dpm0644 -t %{buildroot}%{_mandir}/man5 man/zram-generator.conf.5 %if %{with check} %check -export SYSTEMD_UTIL_DIR=$(pkg-config --variable=systemdutildir systemd) +export SYSTEMD_UTIL_DIR=%{_systemd_util_dir} %cargo_test %endif %changelog +* Tue Mar 23 2021 Zbigniew Jędrzejewski-Szmek - 0.3.2-3 +- Fix missing path to generator dir + +* Fri Mar 19 2021 Vasiliy Glazov - 0.3.2-2 +- Fix max-zram-size value to 8GB + * Wed Feb 24 2021 Zbigniew Jędrzejewski-Szmek - 0.3.2-1 - Downgrade logging levels (#1930869) diff --git a/zram-generator.conf b/zram-generator.conf index 5f5a1ae..a5432f9 100644 --- a/zram-generator.conf +++ b/zram-generator.conf @@ -6,4 +6,4 @@ # /etc/systemd/zram-generator.conf file. [zram0] zram-fraction = 1.0 -max-zram-size = 8096 +max-zram-size = 8192