[packages/gcc] - files fixes

qboosh qboosh at pld-linux.org
Wed Jan 14 17:14:05 CET 2015


commit b15cec1b1b5e536d9d5227933028b3b260cab91b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jan 14 17:15:35 2015 +0100

    - files fixes

 gcc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gcc.spec b/gcc.spec
index 9169430..d32930f 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -2247,7 +2247,6 @@ Summary:	Development files for the Leak Sanitizer library - %{m2_desc} version
 Summary(pl.UTF-8):	Pliki programistyczne biblioteki Leak Sanitizer - wersja %{m2_desc}
 License:	BSD-like or MIT
 Group:		Development/Libraries
-Requires:	liblsan-devel = %{epoch}:%{version}-%{release}
 Requires:	liblsan-multilib-%{multilib2} = %{epoch}:%{version}-%{release}
 
 %description -n liblsan-multilib-%{multilib2}-devel
@@ -3548,7 +3547,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n libgcc
 %defattr(644,root,root,755)
-%doc COPYING.RUNTIME ChangeLog
+%doc COPYING.RUNTIME libgcc/ChangeLog
 %attr(755,root,root) %{_slibdir}/libgcc_s.so.1
 %attr(755,root,root) %{_slibdir}/libitm.so.*.*.*
 %attr(755,root,root) %{_slibdir}/libssp.so.*.*.*
@@ -4423,6 +4422,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdirm2}/liblsan.so
 %{_libdirm2}/liblsan.la
+# it looks like duplicate of file from liblsan-devel, but actually it isn't:
+# these packages are mutually exclusive
+# (either liblsan-devel.x86_64 or liblsan-multilib-64.x32)
+%{gcclibdir}/include/sanitizer/lsan_interface.h
 
 %files -n liblsan-multilib-%{multilib2}-static
 %defattr(644,root,root,755)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gcc.git/commitdiff/b15cec1b1b5e536d9d5227933028b3b260cab91b



More information about the pld-cvs-commit mailing list