(no commit message)
authorJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 28 Oct 2019 07:10:44 +0000 (08:10 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Mon, 28 Oct 2019 07:10:44 +0000 (08:10 +0100)
lldb-experimental.spec

index a5e0e66..eecd208 100644 (file)
@@ -12,7 +12,7 @@
 %endif
 Name: lldb-experimental
 Version: 10.0.0
 %endif
 Name: lldb-experimental
 Version: 10.0.0
-Release: 0.20191027snap1%{?dist}
+Release: 0.20191028snap0%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -169,13 +169,10 @@ done
 rm -fv %{buildroot}%{_libdir}/*.a
 
 ### python: fix liblldb.so -> liblldb.so.7 symlink target
 rm -fv %{buildroot}%{_libdir}/*.a
 
 ### python: fix liblldb.so -> liblldb.so.7 symlink target
-(cd %{buildroot}%{pkg_prefix}/%{_lib}/python*/site-packages/lldb/
+(cd %{buildroot}%{pkg_prefix}/lib/python*/site-packages/lldb/
  ln -vsf "$(dirname $(readlink _lldb.so))/$(readlink $(readlink _lldb.so))" _lldb.so
 )
 
  ln -vsf "$(dirname $(readlink _lldb.so))/$(readlink $(readlink _lldb.so))" _lldb.so
 )
 
-# FIXME: Port it to Python 3: remove bundled six.py - Python 2<->3
-rm -f %{buildroot}%{pkg_prefix}/%{_lib}/python*/site-packages/six.py*
-
 %files
 %{_bindir}/lldb-experimental
 #{_bindir}/lldb-mi-experimental
 %files
 %{_bindir}/lldb-experimental
 #{_bindir}/lldb-mi-experimental
@@ -186,7 +183,7 @@ rm -f %{buildroot}%{pkg_prefix}/%{_lib}/python*/site-packages/six.py*
 %{pkg_prefix}/bin/lldb-argdumper
 # RHEL-7: File not found by glob: .../lib{lldb,clang,LLVM}*.so.*
 %{pkg_prefix}/%{_lib}/libl*.so.*
 %{pkg_prefix}/bin/lldb-argdumper
 # RHEL-7: File not found by glob: .../lib{lldb,clang,LLVM}*.so.*
 %{pkg_prefix}/%{_lib}/libl*.so.*
-%{pkg_prefix}/%{_lib}/python*
+%{pkg_prefix}/lib/python*
 
 %files devel
 %{pkg_prefix}/include
 
 %files devel
 %{pkg_prefix}/include