X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=5f6bbc113cb414bbfc9ede23d8c5ddc269f49543;hp=922118cacc36ea6190bc6803d1ecd6f33a6a73f4;hb=b1275d137dc86c5aa09f20b889dcf3754e305795;hpb=2a1cabfb41a73055b2469d2f94a97acc4a29bdec

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 922118c..5f6bbc1 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -11,20 +11,25 @@
 %global debug_package %{nil}
 %endif
 Name: lldb-experimental
-Version: 10.0.0
-Release: 0.20190817snap5%{?dist}
+Version: 11.0.0
+Release: 0.20200424snap1%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
 ExclusiveArch: x86_64
-BuildRequires: gcc-c++ git libedit-devel swig libatomic ninja-build libxml2-devel zlib-devel valgrind-devel libpfm-devel epydoc
+BuildRequires: gcc-c++ git libedit-devel swig libatomic ninja-build libxml2-devel zlib-devel valgrind-devel libpfm-devel
+# https://src.fedoraproject.org/rpms/epydoc
+#BuildRequires: epydoc
 %if 0%{?rhel:1} && 0%{?rhel} <= 7
 BuildRequires: llvm-toolset-7-cmake devtoolset-8-gcc-c++ python-devel python2-pyyaml
 # https://bugzilla.redhat.com/show_bug.cgi?id=1511892
 %global __cmake /opt/rh/llvm-toolset-7/root/usr/bin/cmake3
 %global ninjabuild ninja-build
 %else
-BuildRequires: cmake z3-devel
+%if !0%{?rhel:1} || 0%{?rhel} > 8
+BuildRequires: z3-devel
+%endif
+BuildRequires: cmake
 BuildRequires: python3-devel python3-pygments python3-pyyaml
 # removed in F31+
 #BuildRequires: xar-devel
@@ -167,13 +172,10 @@ done
 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
 )
 
-# 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
@@ -184,7 +186,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}/%{_lib}/python*
+%{pkg_prefix}/lib/python*
 
 %files devel
 %{pkg_prefix}/include