From 611c1e59385d9f5ccbe9d51c7241ad5c3e267b16 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Sat, 9 Mar 2019 15:00:52 +0100
Subject: [PATCH] Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 .gitignore                                    |   1 +
 rust-zram-generator.spec                      |  47 ++++++++++--------
 sources                                       |   1 +
 zram-generator-0.1.1.crate                    | Bin 4762 -> 0 bytes
 ...s.diff => zram-generator-fix-metadata.diff |   4 +-
 5 files changed, 29 insertions(+), 24 deletions(-)
 delete mode 100644 zram-generator-0.1.1.crate
 rename bump-versions.diff => zram-generator-fix-metadata.diff (64%)

diff --git a/.gitignore b/.gitignore
index e69de29..ad1679f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/zram-generator-0.1.1.crate
diff --git a/rust-zram-generator.spec b/rust-zram-generator.spec
index 8a72e86..b445c2c 100644
--- a/rust-zram-generator.spec
+++ b/rust-zram-generator.spec
@@ -5,39 +5,45 @@
 
 Name:           rust-%{crate}
 Version:        0.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Systemd unit generator for zram devices
 
 License:        MIT
-URL:            https://github.com/systemd/zram-generator
-Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
+URL:            https://crates.io/crates/zram-generator
+Source:         %{crates_source}
+# Initial patched metadata
+# * Update dependencies, https://github.com/systemd/zram-generator/commit/6f2b69c4a38b6da92fc4509b7d055423b8440238
+Patch0:         zram-generator-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(failure) >= 0.1.0 with crate(failure) < 0.2.0)
-BuildRequires:  (crate(failure_derive) >= 0.1.0 with crate(failure_derive) < 0.2.0)
-BuildRequires:  (crate(rust-ini) >= 0.12.0 with crate(rust-ini) < 1.0.0)
+BuildRequires:  (crate(failure/default) >= 0.1.2 with crate(failure/default) < 0.2.0)
+BuildRequires:  (crate(failure_derive/default) >= 0.1.0 with crate(failure_derive/default) < 0.2.0)
+BuildRequires:  (crate(rust-ini/default) >= 0.12.0 with crate(rust-ini/default) < 0.13.0)
 
-BuildRequires:  systemd
-
-Patch0:         bump-versions.diff
-
-%description
-This is a systemd unit generator that creates a unit file to create a
-zram device. To activate, copy
-/usr/share/doc/rust-zram-generator/zram-generator.conf.example to
+%global _description \
+This is a systemd unit generator that creates a unit file to create a\
+zram device. To activate, copy\
+/usr/share/doc/rust-zram-generator/zram-generator.conf.example to\
 /etc/systemd/zram-generator.conf and possibly edit to adjust the limits.
 
+%description %{_description}
+
 %package     -n %{crate}
 Summary:        %{summary}
 
 %description -n %{crate}
 %{summary}.
 
+%files       -n %{crate}
+%license LICENSE
+%doc zram-generator.conf.example
+%doc README.md TODO
+%{_systemdgeneratordir}/zram-generator
+
 %prep
-%autosetup -n %{crate}-%{version} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1
 %cargo_prep
 
 %build
@@ -54,13 +60,10 @@ mv -v %{buildroot}%{_bindir}/zram-generator %{buildroot}%{_systemdgeneratordir}/
 %cargo_test
 %endif
 
-%files       -n %{crate}
-%license LICENSE
-%doc zram-generator.conf.example
-%doc README.md TODO
-%{_systemdgeneratordir}/zram-generator
-
 %changelog
+* 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)
 
diff --git a/sources b/sources
index e69de29..77c79e1 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (zram-generator-0.1.1.crate) = b48638b4821fe914a2aa910fbabd060ea4f14a71a2db4010bbd3d3c9e50a64350f4a6e37223b035bdc45983fc10426693ebacda8979b9297ec3e7817ff78ac57
diff --git a/zram-generator-0.1.1.crate b/zram-generator-0.1.1.crate
deleted file mode 100644
index 81ceec23915dc97b3d4ff2e79fc08824cf20a0cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4762
zcmV;L5@qcliwFn+00002|9Wy^Z7pYIZe?;|bZ>GkFfK7JF)m|rVRU5x?OW+~+eVho
zZ#+ero{>Qv5?r*n2M*<?CCcWEB<hfK+-^mO4U$C?5f%;>%d(<*k9nVYu=#EkmI6sx
zPRH?ScMB)6gj()acQ5EuV7b*f_jq7Meo(C&4Wm&rCRQ-_YZKp_+4CQM_fv1w>-+n=
zKh*2>#`C?p`cpi6_5B|jJ3BkO`@7Bh^Bs&g_L{qx|KS@vaTr+vQ2uTv<&*vVPM(W#
zY&+9SEr1**ti?*TI1FlI+pCF@l9-tK>r)t$lQYMfhnT)7RS*4TRCV|V?zDDF6^4N+
zAIEdsoB6G#9B^#!stWCDRo^+4>ZeM;oxrDGJpURiE;a2U;(>dqec-{^4><rwLCi56
z`f)Jfm)UQI<4-K78t}OtM#0UcHnjsjffC<jw1x{S;5Dht>AF%5U;>@zVb%7*elkm2
z7g4kf&00-P8@3NV`O>i_yn1a%3tCb{UDCdn(_Vi*ZM6Tn9ociw5BOKX@sR!3_nxoX
z|L*?tNBjR4&-VXlHSSqshgV4zwAvwA3)$9{R)b{bJkqweYuiQ;8sn?)SkWJ!jn78=
zmpTynu4DMY@6P}>+J9~;^<CIJ?0>i3Y&Q2AyCVMY?d?3;|2KFpme%CTnj@}ymP^sL
zRMdzP1>(^5J(?2QQPQk9TKIvC`F|ZFP}uyM{pbJv?=<+tf8p2Rm0cZta`_ee@zeMw
z{KT*RY<tGFb!{x2gVLqu*c0xF$X+__4oljUhm*iwMhTL^O&D=^%3{xsSVjk%;eR5H
zP5B1^2us?+cli>et1%maYY~r)iSO1z38%Kok9INTOYTj%H?etmsm(0gi36VSS4!VU
zQy$nK@?lDKs<vk*1I_O_=zqEWe-#{L5Bs~j_nAy%@A-b73kVZxH0wM2-<SP=r_WP1
zeA6AU<L*g^;b;5puy@)Xb`RSpC-2$o&RM759(In{tM}}%-GANFo@!6oy9M`HymWkP
zYI}1g^JEtJELw1uWzs^4*tP9A3=YG0t;j~w?A!oA38|%PIrb-BV!5udne6}$8M<qI
zw6TD}j+fXswjDd7jUxXB5SBQlkomI&k>yP>6Z#<FI<O<o{)U~4zcJO=0U`2p3UzMG
z4VI<(<(0Kq-JP);KW1a@*r;lVzkojrfs64V0G+mnF*_8Lv!%l=xHa*+<zcrShB1Df
zTecTQQaI#99Lt-_q6DNY{m`bG#Yk{H3pjT2DH3pqHU~Zipleh!7_ua+cnKyr9AYj(
zAt6Y|v9Gvu!yMngB1zq_sXd#4bT48$$;pi;3+5ud2LV>-i}bGy$N24I!8i8(tD&b5
z3XH__U#_sZ8ZwMxgm`dy8aY-M{zHV2jsE|nd)PS}biNjj2kO5jrnCHSXGi$|oqg1V
zkNMvp|Da`agA{)ev1YyTC-z%SSkunYt%0K>wT7=E2RXiB^T6^VKCQ4>z&ZKo$%0DB
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

diff --git a/bump-versions.diff b/zram-generator-fix-metadata.diff
similarity index 64%
rename from bump-versions.diff
rename to zram-generator-fix-metadata.diff
index ed2e781..ef3ebf0 100644
--- a/bump-versions.diff
+++ b/zram-generator-fix-metadata.diff
@@ -1,5 +1,5 @@
---- zram-generator-0.1.1/Cargo.toml~	1970-01-01 01:00:00.000000000 +0100
-+++ zram-generator-0.1.1/Cargo.toml	2019-03-01 16:48:14.223492246 +0100
+--- zram-generator-0.1.1/Cargo.toml	1970-01-01T01:00:00+01:00
++++ zram-generator-0.1.1/Cargo.toml	2019-03-09T14:58:31.909576+01:00
 @@ -18,10 +18,10 @@
  homepage = "https://github.com/systemd/zram-generator"
  license = "MIT"