[packages/rust] - fixed install

baggins baggins at pld-linux.org
Mon Nov 20 10:06:18 CET 2017


commit 4f353dba9eddfc53bab2178e48c2388b938c7f93
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Nov 20 10:06:06 2017 +0100

    - fixed install

 rust.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/rust.spec b/rust.spec
index 3625f3f..4264b07 100644
--- a/rust.spec
+++ b/rust.spec
@@ -222,7 +222,8 @@ find src/vendor -name .cargo-checksum.json \
 %install
 rm -rf $RPM_BUILD_ROOT
 
-DESTDIR=$RPM_BUILD_ROOT ./x.py dist --install
+DESTDIR=$RPM_BUILD_ROOT ./x.py install
+DESTDIR=$RPM_BUILD_ROOT ./x.py install src
 
 # Make sure the shared libraries are in the proper libdir
 %if "%{_libdir}" != "%{common_libdir}"
@@ -261,6 +262,9 @@ find $RPM_BUILD_ROOT%{_docdir}/%{name}/html -type f -exec chmod -x '{}' '+'
 install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
 %{__mv} $RPM_BUILD_ROOT%{rustlibdir}/etc $RPM_BUILD_ROOT%{_datadir}/%{name}
 
+# We don't need stdlib source
+%{__rm} -r $RPM_BUILD_ROOT%{rustlibdir}/src
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -273,14 +277,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/rustc
 %attr(755,root,root) %{_bindir}/rustdoc
 %attr(755,root,root) %{_libdir}/libarena-*.so
-%attr(755,root,root) %{_libdir}/libflate-*.so
 %attr(755,root,root) %{_libdir}/libfmt_macros-*.so
-%attr(755,root,root) %{_libdir}/libgetopts-*.so
 %attr(755,root,root) %{_libdir}/libgraphviz-*.so
 %attr(755,root,root) %{_libdir}/libproc_macro-*.so
-%attr(755,root,root) %{_libdir}/libproc_macro_plugin-*.so
 %attr(755,root,root) %{_libdir}/librustc*-*.so
-%attr(755,root,root) %{_libdir}/librustdoc-*.so
 %attr(755,root,root) %{_libdir}/libserialize-*.so
 %attr(755,root,root) %{_libdir}/libstd-*.so
 %attr(755,root,root) %{_libdir}/libsyntax-*.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rust.git/commitdiff/4f353dba9eddfc53bab2178e48c2388b938c7f93



More information about the pld-cvs-commit mailing list