Merge remote-tracking branch 'origin/master' into f33

Signed-off-by: Igor Raits <ignatenkobrain@fedoraproject.org>

.gitignore

@@ -1,6 +1,3 @@
-/dua-cli-2.3.2.crate
-/dua-cli-2.3.3.crate
-/dua-cli-2.3.5.crate
 /dua-cli-2.3.6.crate
 /dua-cli-2.3.8.crate
 /dua-cli-2.3.9.crate

rust-dua-cli.spec

@@ -2,6 +2,8 @@
 # * The test code is not shipped, but even if it would - the testing parts
 #   are missing too.
 %bcond_with check
+# No devel stuff in released Fedora
+%global __cargo_is_lib() false
 
 %global crate dua-cli
 
@@ -19,9 +21,6 @@ Source:         %{crates_source}
 Patch0:         dua-cli-fix-metadata.diff
 
 ExclusiveArch:  %{rust_arches}
-%if %{__cargo_skip_build}
-BuildArch:      noarch
-%endif
 
 BuildRequires:  rust-packaging
 
@@ -30,7 +29,6 @@ Tool to conveniently learn about the disk usage of directories, fast!.}
 
 %description %{_description}
 
-%if ! %{__cargo_skip_build}
 %package     -n %{crate}
 Summary:        %{summary}
 # (MIT or ASL 2.0) and BSD
@@ -44,33 +42,6 @@ License:        MIT and BSD
 %license LICENSE
 %doc README.md
 %{_bindir}/dua
-%endif
-
-%package        devel
-Summary:        %{summary}
-BuildArch:      noarch
-
-%description    devel %{_description}
-
-This package contains library source intended for building other packages
-which use "%{crate}" crate.
-
-%files          devel
-%license LICENSE
-%doc README.md
-%{cargo_registry}/%{crate}-%{version_no_tilde}/
-
-%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_no_tilde}/Cargo.toml
 
 %prep
 %autosetup -n %{crate}-%{version_no_tilde} -p1
@@ -126,17 +97,5 @@ which use "default" feature of "%{crate}" crate.
 * Thu Mar 26 08:32:46 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.8-1
 - Update to 2.3.8
 
-* Tue Mar 17 16:47:38 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.6-1
-- Update to 2.3.6
-
-* Sun Mar 15 18:07:16 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.5-1
-- Update to 2.3.5
-
-* Sun Mar 15 09:14:52 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.3-1
-- Update to 2.3.3
-
-* Tue Feb 25 02:05:44 CET 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.2-1
-- Update to 2.3.2
-
-* Mon Feb 24 20:18:39 EET 2020 Artem Polishchuk <ego.cordatus@gmail.com> - 2.3.1-1
-- Initial package
+* Tue Mar 17 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 2.3.6-1.1
+- Initial import