Add missing newline in config file

[skip changelog]

.gitignore

@@ -6,3 +6,7 @@
 /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
+/zram-generator-1.1.0.crate
+/zram-generator-1.1.1.crate
+/zram-generator-1.1.2.crate

changelog

@@ -0,0 +1,77 @@
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu May 27 2021 Fabio Valentini <decathorpe@gmail.com> - 0.3.2-4
+- Allow building against rust-ini 0.17 (#1968720)
+
+* Tue Mar 23 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.2-3
+- Fix missing path to generator dir
+
+* Fri Mar 19 2021 Vasiliy Glazov <vascom2@gmail.com> - 0.3.2-2
+- Fix max-zram-size value to 8GB
+
+* Wed Feb 24 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.2-1
+- Downgrade logging levels (#1930869)
+
+* Wed Jan 27 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.1-2
+- Implement https://fedoraproject.org/wiki/Changes/Scale_ZRAM_to_full_memory_size (#1921084)
+
+* Sat Jan 23 13:23:10 CET 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.3.1-1
+- Update to 0.3.1
+
+* Wed Jan 13 16:57:21 CET 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.3.0~rc.1-1
+- Update to 0.3.0-rc.1
+
+* Mon Dec 28 13:34:14 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-6
+- Rebuild
+
+* Mon Nov 23 2020 Fabio Valentini <decathorpe@gmail.com> - 0.2.0-5
+- Allow building against rust-ini 0.16.
+
+* Sun Aug 16 15:02:03 GMT 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-4
+- Rebuild
+
+* Sat Aug  1 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.2.0-3
+- Obsolete zram package from zram-generator-defaults
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Jul 04 17:30:46 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-1
+- Update to 0.2.0
+
+* Tue Jun 23 19:56:14 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~rc.1-1
+- Update to 0.2.0-rc.1
+
+* Thu Jun 18 11:30:43 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-3
+- Create a subpackage with default configuration
+
+* Thu Jun 18 10:14:43 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-2
+- Install swap-create unit file
+
+* Thu Jun 18 09:27:37 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-1
+- Update to 0.2.0-beta.1
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Oct  7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.2-1
+- Update to latest version
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jul 22 21:30:22 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-4
+- Regenerate
+
+* Sat Mar 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-3
+- Adapt to new packaging
+
+* Fri Mar  1 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.1-2
+- Add crude patch to fix build (#1676154)
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Aug 16 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.1-1
+- Initial package

rust-zram-generator.spec

@@ -1,11 +1,11 @@
-# Generated by rust2rpm 17
+# Generated by rust2rpm 19
 %bcond_without check
 
 %global crate zram-generator
 
 Name:           rust-%{crate}
-Version:        0.3.2
-Release:        4%{?dist}
+Version:        1.1.2
+Release:        %autorelease
 Summary:        Systemd unit generator for zram swap devices
 
 # Upstream license specification: MIT
@@ -13,33 +13,26 @@ 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}
-BuildArch:      noarch
-%endif
 
 BuildRequires:  rust-packaging
 
 %global _description %{expand:
 This is a systemd unit generator that enables swap on zram.
-(With zram, there is no physical swap device. Part of the avaialable RAM
+(With zram, there is no physical swap device. Part of the available RAM
 is used to store compressed pages, essentially trading CPU cycles for memory.)
 
 To activate, install %{crate}-defaults subpackage.}
 
 %description %{_description}
 
-%if ! %{__cargo_skip_build}
 %package     -n %{crate}
 Summary:        %{summary}
 # MIT
 # MIT or ASL 2.0
 License:        MIT
-Recommends:     /usr/bin/zramctl
+Recommends:     %{_sbindir}/zramctl
 
 %description -n %{crate} %{_description}
 
@@ -63,7 +56,6 @@ BuildArch:      noarch
 
 %files       -n %{crate}-defaults
 %{_prefix}/lib/systemd/zram-generator.conf
-%endif
 
 %package        devel
 Summary:        %{summary}
@@ -71,8 +63,8 @@ BuildArch:      noarch
 
 %description    devel %{_description}
 
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
 
 %files          devel
 %license LICENSE
@@ -104,99 +96,31 @@ 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} \
+  NOBUILD=1
+
 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
 export SYSTEMD_UTIL_DIR=%{_systemd_util_dir}
 %cargo_test
+
+: ==============================================================================
+%{buildroot}%{_systemdgeneratordir}/zram-generator --help
+: ==============================================================================
+%{buildroot}%{_systemdgeneratordir}/zram-generator --help | grep -q %{_systemd_util_dir}/systemd-makefs
 %endif
 
 %changelog
-* Thu May 27 2021 Fabio Valentini <decathorpe@gmail.com> - 0.3.2-4
-- Allow building against rust-ini 0.17 (#1968720)
-
-* Tue Mar 23 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.2-3
-- Fix missing path to generator dir
-
-* Fri Mar 19 2021 Vasiliy Glazov <vascom2@gmail.com> - 0.3.2-2
-- Fix max-zram-size value to 8GB
-
-* Wed Feb 24 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.2-1
-- Downgrade logging levels (#1930869)
-
-* Wed Jan 27 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.3.1-2
-- Implement https://fedoraproject.org/wiki/Changes/Scale_ZRAM_to_full_memory_size (#1921084)
-
-* Sat Jan 23 13:23:10 CET 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.3.1-1
-- Update to 0.3.1
-
-* Wed Jan 13 16:57:21 CET 2021 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.3.0~rc.1-1
-- Update to 0.3.0-rc.1
-
-* Mon Dec 28 13:34:14 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-6
-- Rebuild
-
-* Mon Nov 23 2020 Fabio Valentini <decathorpe@gmail.com> - 0.2.0-5
-- Allow building against rust-ini 0.16.
-
-* Sun Aug 16 15:02:03 GMT 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-4
-- Rebuild
-
-* Sat Aug  1 2020 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.2.0-3
-- Obsolete zram package from zram-generator-defaults
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 04 17:30:46 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0-1
-- Update to 0.2.0
-
-* Tue Jun 23 19:56:14 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~rc.1-1
-- Update to 0.2.0-rc.1
-
-* Thu Jun 18 11:30:43 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-3
-- Create a subpackage with default configuration
-
-* Thu Jun 18 10:14:43 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-2
-- Install swap-create unit file
-
-* Thu Jun 18 09:27:37 CEST 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.2.0~beta.1-1
-- Update to 0.2.0-beta.1
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Oct  7 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.2-1
-- Update to latest version
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 22 21:30:22 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-4
-- Regenerate
-
-* Sat Mar 09 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.1.1-3
-- Adapt to new packaging
-
-* Fri Mar  1 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.1-2
-- Add crude patch to fix build (#1676154)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Aug 16 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.1.1-1
-- Initial package
+%autochangelog

sources

@@ -1 +1 @@
-SHA512 (zram-generator-0.3.2.crate) = e16effd58c6e4a91d877316e7ee000d36be6d9ce2d054804794c218cd87feb162179e73daa03e9570338796ea6ffe63a16720a1f2057cee2de616aa00a93311f
+SHA512 (zram-generator-1.1.2.crate) = dfad7d4384eb4635c33475e4571d33a3135c92cf42138dd1cb50f19aef4b3f2465130783e385a3f544e43a1653273cee9b2d8f45177a8b053acf37805dc939c8

zram-generator-fix-metadata.diff

@@ -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"
- 

zram-generator.conf

@@ -5,5 +5,4 @@
 # To disable, uninstall zram-generator-defaults or create empty
 # /etc/systemd/zram-generator.conf file.
 [zram0]
-zram-fraction = 1.0
-max-zram-size = 8192
+zram-size = min(ram, 8192)