X-Git-Url: http://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=583b2f484d60fdae16c12cb47ac253f105d869ef;hp=3f6f45ae050fc978b486c10e09abc690a103b0d5;hb=cbbd9999cd174aca2fb84fc7982a15ede604a87d;hpb=bc872c5d156be6d2544e3eae736c100e688a1bb1

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 3f6f45a..583b2f4 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.20190817snap2%{?dist}
+Version: 11.0.0
+Release: 0.20200424snap2%{?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
@@ -59,10 +64,19 @@ The package contains header files for %{name}.
 
 %prep
 %setup -q -c -T
-git clone --depth 1 --no-tags --single-branch --reference-if-able reference https://github.com/llvm/llvm-project.git .
+OPTS=""
+%if !0%{?rhel:1} || 0%{?rhel} > 7
+  OPTS="$OPTS --no-tags"
+%endif
+REF="reference"
+# RHEL-7 does not support: --reference-if-able
+test -d ../$REF/ && OPTS="$OPTS --reference ../$REF"
+# 2500 = 1 month in 2019
+git clone --depth 10000 --single-branch $OPTS https://github.com/llvm/llvm-project.git .
 %if %{use_jankratochvil_dwz} || %{use_jankratochvil_rust}
 git remote remove jankratochvil || :
-git remote add jankratochvil git://git.jankratochvil.net/lldb
+#git remote add jankratochvil git://git.jankratochvil.net/lldb
+git remote add jankratochvil https://github.com/jankratochvil/llvm-project.git
 git fetch jankratochvil
 git config user.email jankratochvil@copr.fedorainfracloud.org
 git config user.name jankratochvil
@@ -163,9 +177,6 @@ rm -fv %{buildroot}%{_libdir}/*.a
  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
@@ -176,7 +187,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