Adapt to new packaging

rust-addr2line.spec

@@ -8,7 +8,7 @@
 
 Name:           rust-%{crate}
 Version:        0.7.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform symbolication library written in Rust, using `gimli`
 
 # Upstream license specification: Apache-2.0/MIT
@@ -22,36 +22,77 @@ Patch0:         addr2line-fix-metadata.diff
 ExclusiveArch:  %{rust_arches}
 
 BuildRequires:  rust-packaging
-# [dependencies]
-BuildRequires:  (crate(cpp_demangle) >= 0.2.0 with crate(cpp_demangle) < 0.3.0)
-BuildRequires:  (crate(fallible-iterator) >= 0.1.0 with crate(fallible-iterator) < 0.2.0)
-BuildRequires:  (crate(gimli) >= 0.16.0 with crate(gimli) < 0.17.0)
-BuildRequires:  (crate(intervaltree) >= 0.2.0 with crate(intervaltree) < 0.3.0)
-BuildRequires:  (crate(lazycell) >= 1.0.0 with crate(lazycell) < 2.0.0)
-BuildRequires:  (crate(object) >= 0.10.0 with crate(object) < 0.11.0)
-BuildRequires:  (crate(rustc-demangle) >= 0.1.0 with crate(rustc-demangle) < 0.2.0)
-BuildRequires:  (crate(smallvec) >= 0.6.0 with crate(smallvec) < 0.7.0)
+BuildRequires:  (crate(cpp_demangle/default) >= 0.2.0 with crate(cpp_demangle/default) < 0.3.0)
+BuildRequires:  (crate(fallible-iterator/default) >= 0.1.0 with crate(fallible-iterator/default) < 0.2.0)
+BuildRequires:  (crate(gimli/default) >= 0.16.0 with crate(gimli/default) < 0.17.0)
+BuildRequires:  (crate(intervaltree/default) >= 0.2.0 with crate(intervaltree/default) < 0.3.0)
+BuildRequires:  (crate(lazycell/default) >= 1.0.0 with crate(lazycell/default) < 2.0.0)
+BuildRequires:  (crate(object/default) >= 0.10.0 with crate(object/default) < 0.11.0)
+BuildRequires:  (crate(rustc-demangle/default) >= 0.1.0 with crate(rustc-demangle/default) < 0.2.0)
+BuildRequires:  (crate(smallvec/default) >= 0.6.0 with crate(smallvec/default) < 0.7.0)
 %if %{with check}
-# [dev-dependencies]
-BuildRequires:  (crate(backtrace) >= 0.3.0 with crate(backtrace) < 0.4.0)
-BuildRequires:  (crate(clap) >= 2.0.0 with crate(clap) < 3.0.0)
-BuildRequires:  (crate(findshlibs) >= 0.4.0 with crate(findshlibs) < 0.5.0)
-BuildRequires:  (crate(memmap) >= 0.6.0 with crate(memmap) < 0.7.0)
-BuildRequires:  (crate(rustc-test) >= 0.3.0 with crate(rustc-test) < 0.4.0)
+BuildRequires:  (crate(backtrace/default) >= 0.3.0 with crate(backtrace/default) < 0.4.0)
+BuildRequires:  (crate(clap/default) >= 2.0.0 with crate(clap/default) < 3.0.0)
+BuildRequires:  (crate(findshlibs/default) >= 0.4.0 with crate(findshlibs/default) < 0.5.0)
+BuildRequires:  (crate(memmap/default) >= 0.6.0 with crate(memmap/default) < 0.7.0)
+BuildRequires:  (crate(rustc-test/default) >= 0.3.0 with crate(rustc-test/default) < 0.4.0)
 %endif
 
-%description
-%{summary}.
+%global _description \
+A cross-platform symbolication library written in Rust, using `gimli`.
+
+%description %{_description}
 
 %package        devel
 Summary:        %{summary}
 BuildArch:      noarch
 
-%description    devel
-A cross-platform symbolication library written in Rust, using `gimli`.
+%description    devel %{_description}
 
 This package contains library source intended for building other packages
-which use %{crate} from crates.io.
+which use "%{crate}" crate.
+
+%files          devel
+%license LICENSE-APACHE LICENSE-MIT
+%doc README.md
+%{cargo_registry}/%{crate}-%{version}/
+%exclude %{cargo_registry}/%{crate}-%{version}/{benchmark.sh,bench.plot.r,coverage,memory.png,time.png}
+
+%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}+cpp_demangle-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+cpp_demangle-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "cpp_demangle" feature of "%{crate}" crate.
+
+%files       -n %{name}+cpp_demangle-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
+
+%package     -n %{name}+rustc-demangle-devel
+Summary:        %{summary}
+BuildArch:      noarch
+
+%description -n %{name}+rustc-demangle-devel %{_description}
+
+This package contains library source intended for building other packages
+which use "rustc-demangle" feature of "%{crate}" crate.
+
+%files       -n %{name}+rustc-demangle-devel
+%ghost %{cargo_registry}/%{crate}-%{version}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version} -p1
@@ -68,13 +109,10 @@ which use %{crate} from crates.io.
 %cargo_test
 %endif
 
-%files          devel
-%license LICENSE-APACHE LICENSE-MIT
-%doc README.md
-%{cargo_registry}/%{crate}-%{version}/
-%exclude %{cargo_registry}/%{crate}-%{version}/{benchmark.sh,bench.plot.r,coverage,memory.png,time.png}
-
 %changelog
+* Tue Nov 13 2018 Josh Stone <jistone@redhat.com> - 0.7.0-3
+- Adapt to new packaging
+
 * Tue Oct 02 2018 Josh Stone <jistone@redhat.com> - 0.7.0-2
 - Bump object to 0.10