diff --git a/rust-rpmlintrc b/rust-rpmlintrc new file mode 100644 index 0000000..1a9b681 --- /dev/null +++ b/rust-rpmlintrc @@ -0,0 +1,6 @@ +# filters for rust-src +addFilter("devel-file-in-non-devel-package.*/usr/lib/rustlib/src/.*") +addFilter("non-executable-script*./usr/lib/rustlib/src/.*") +# filters for rust-std +# rlib not in elf format +addFilter("binaryinfo-readelf-failed*./usr/lib/rustlib/*.rlib") \ No newline at end of file diff --git a/rust.changes b/rust.changes index 9977e93..78b0318 100644 --- a/rust.changes +++ b/rust.changes @@ -2,6 +2,8 @@ Fri Sep 1 10:14:10 UTC 2017 - luke.nukem.jones@gmail.com - adjust build process and add package for Rust source +- clean-up of useless provides +- add rpmlintrc ------------------------------------------------------------------- Tue Aug 8 23:06:44 UTC 2017 - luke.nukem.jones@gmail.com diff --git a/rust.spec b/rust.spec index 6a690a2..09155cb 100644 --- a/rust.spec +++ b/rust.spec @@ -56,6 +56,7 @@ Group: Development/Languages/Other Url: http://www.rust-lang.org Source0: %{dl_url}/rustc-%{version}-src.tar.gz Source1: config.toml +Source99: %{name}-rpmlintrc Source100: cargo-%{cargo_version}-x86_64-unknown-linux-gnu.tar.gz Source101: cargo-%{cargo_version}-i686-unknown-linux-gnu.tar.gz Source102: cargo-%{cargo_version}-aarch64-unknown-linux-gnu.tar.gz @@ -122,7 +123,6 @@ control like a low-level language would. %package -n rust-std Summary: Standard library for Rust Group: Development/Languages/Other -Provides: rust-std = %{version} Conflicts: otherproviders(rust-std) %description -n rust-std @@ -132,7 +132,6 @@ applications written in Rust. %package -n rust-doc Summary: Rust documentation Group: Development/Languages/Other -Provides: rust-doc = %{version} Conflicts: otherproviders(rust-doc) %description -n rust-doc @@ -142,7 +141,6 @@ Documentation for the Rust language. Summary: Gdb integration for rust binaries Group: Development/Languages/Other Supplements: packageand(%{name}:gdb) -Provides: rust-gdb = %{version} Provides: rustc:%{_bindir}/rust-gdb Conflicts: otherproviders(rust-gdb) @@ -150,6 +148,16 @@ Conflicts: otherproviders(rust-gdb) This subpackage provides pretty printers and a wrapper script for invoking gdb on rust binaries. +%package -n rust-src +Summary: Sources for the Rust standard library +Group: Development/Languages/Other +BuildArch: noarch + +%description -n rust-src +This package includes source files for the Rust standard library. This +is commonly used for function detail lookups in helper programs such +as RLS or racer. + %prep %ifarch x86_64 %setup -q -T -b 100 -n cargo-%{cargo_version}-%{rust_triple} @@ -253,6 +261,7 @@ rm %{buildroot}%{_defaultdocdir}/%{name}/{COPYRIGHT,LICENSE-APACHE,LICENSE-MIT} %{_mandir}/man1/rustdoc.1* %{_prefix}/lib/lib*.so %exclude %{_docdir}/%{name}/html +%exclude %{rustlibdir}/src %files -n rust-std %defattr(-,root,root) @@ -274,14 +283,13 @@ rm %{buildroot}%{_defaultdocdir}/%{name}/{COPYRIGHT,LICENSE-APACHE,LICENSE-MIT} %files -n rust-doc %defattr(-,root,root) -## %license %{_docdir}/%{name}/html/FiraSans-LICENSE.txt -## %license %{_docdir}/%{name}/html/Heuristica-LICENSE.txt -## %license %{_docdir}/%{name}/html/LICENSE-APACHE.txt -## %license %{_docdir}/%{name}/html/LICENSE-MIT.txt -## %license %{_docdir}/%{name}/html/SourceCodePro-LICENSE.txt -## %license %{_docdir}/%{name}/html/SourceSerifPro-LICENSE.txt %dir %{_docdir}/%{name} %dir %{_docdir}/%{name}/html %doc %{_docdir}/%{name}/html/* +%files -n rust-src +%defattr(-,root,root) +%dir %{rustlibdir} +%{rustlibdir}/src + %changelog