Adapt to new packaging

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
6 years ago · 751ec69432
parent 378b97f624
commit 751ec69432
2 changed files with 206 additions and 24 deletions
--- a/rust-uuid.spec
+++ b/rust-uuid.spec
@ -6,43 +6,228 @@

 Name:           rust-%{crate}
 Version:        0.6.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library to generate and parse UUIDs

-License:        MIT or ASL 2.0
+# Upstream license specification: Apache-2.0 OR MIT
+License:        ASL 2.0 or MIT
 URL:            https://crates.io/crates/uuid
 Source0:        https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate
 # Initial patched metadata
 # * Drop slog dependency until packaged
-Patch0:         uuid-0.6.4-fix-metadata.diff
+Patch0:         uuid-fix-metadata.diff

 ExclusiveArch:  %{rust_arches}

 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  ((crate(byteorder) >= 1.0.0 with crate(byteorder) < 2.0.0) with crate(byteorder/i128))
-BuildRequires:  (crate(cfg-if) >= 0.1.2 with crate(cfg-if) < 0.2.0)
-BuildRequires:  (crate(md5) >= 0.3.0 with crate(md5) < 0.4.0)
-BuildRequires:  (crate(rand) >= 0.4.0 with crate(rand) < 0.5.0)
+BuildRequires:  (crate(byteorder/i128) >= 1.0.0 with crate(byteorder/i128) < 2.0.0)
+BuildRequires:  (crate(cfg-if/default) >= 0.1.2 with crate(cfg-if/default) < 0.2.0)
+BuildRequires:  (crate(md5/default) >= 0.3.0 with crate(md5/default) < 0.4.0)
+BuildRequires:  (crate(rand/default) >= 0.4.0 with crate(rand/default) < 0.5.0)
 BuildRequires:  (crate(serde) >= 1.0.56 with crate(serde) < 2.0.0)
-BuildRequires:  (crate(sha1) >= 0.6.0 with crate(sha1) < 0.7.0)
+BuildRequires:  (crate(sha1/default) >= 0.6.0 with crate(sha1/default) < 0.7.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(serde_test) >= 1.0.56 with crate(serde_test) < 2.0.0)
+BuildRequires:  (crate(serde_test/default) >= 1.0.56 with crate(serde_test/default) < 2.0.0)
 %endif

-%description
-%{summary}.
+%global _description \
+A library to generate and parse UUIDs.
+
+%description %{_description}

 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch

-%description    devel
-A library to generate and parse UUIDs.
+%description    devel %{_description}
+
+This package contains library source intended for building other packages
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-MIT LICENSE-APACHE
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "default" feature of "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+byteorder-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+byteorder-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "byteorder" feature of "%{crate}" crate.
+
+%files       -n %{name}+byteorder-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+const_fn-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+const_fn-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "const_fn" feature of "%{crate}" crate.
+
+%files       -n %{name}+const_fn-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+md5-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+md5-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "md5" feature of "%{crate}" crate.
+
+%files       -n %{name}+md5-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+nightly-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+nightly-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "nightly" feature of "%{crate}" crate.
+
+%files       -n %{name}+nightly-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+rand-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+rand-devel %{_description}

 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "rand" feature of "%{crate}" crate.
+
+%files       -n %{name}+rand-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+serde-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+serde-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "serde" feature of "%{crate}" crate.
+
+%files       -n %{name}+serde-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+sha1-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+sha1-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "sha1" feature of "%{crate}" crate.
+
+%files       -n %{name}+sha1-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "std" feature of "%{crate}" crate.
+
+%files       -n %{name}+std-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+u128-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+u128-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "u128" feature of "%{crate}" crate.
+
+%files       -n %{name}+u128-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+use_std-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+use_std-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "use_std" feature of "%{crate}" crate.
+
+%files       -n %{name}+use_std-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+v1-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+v1-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "v1" feature of "%{crate}" crate.
+
+%files       -n %{name}+v1-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+v3-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+v3-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "v3" feature of "%{crate}" crate.
+
+%files       -n %{name}+v3-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+v4-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+v4-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "v4" feature of "%{crate}" crate.
+
+%files       -n %{name}+v4-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+v5-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+v5-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "v5" feature of "%{crate}" crate.
+
+%files       -n %{name}+v5-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml

 %prep
 %autosetup -n %{crate}-%{version} -p1
@ -59,13 +244,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif

-%files          devel
-%license LICENSE-MIT LICENSE-APACHE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/bors.toml
-
 %changelog
+* Fri Nov 02 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.5-3
+- Adapt to new packaging
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

--- a/uuid-0.6.4-fix-metadata.diff
+++ b/uuid-0.6.4-fix-metadata.diff
@ -1,5 +1,5 @@
--- uuid-0.6.4/Cargo.toml	1970-01-01T01:00:00+01:00
-+++ uuid-0.6.4/Cargo.toml	2018-05-24T09:59:00.062822+02:00
+--- uuid-0.6.5/Cargo.toml	1970-01-01T01:00:00+01:00
+++ uuid-0.6.5/Cargo.toml	2018-11-02T20:13:19.432027+01:00
@@ -52,9 +52,6 @@
 version = "0.6"
 optional = true