X-Git-Url: http://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=bed88233ea6ebdca0c461f8cc932fe77d03ac893;hp=1082a533191dc8de29bcf0c4f9231b1b9a245c0d;hb=829ce8864bd00a42e40114d8cf600488bac9f0ff;hpb=cf2363b063402e1013a21e83dd715dc46241b87c

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 1082a53..bed8823 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -12,7 +12,7 @@
 %endif
 Name: lldb-experimental
 Version: 11.0.0
-Release: 0.20200424snap0%{?dist}
+Release: 0.20200424snap3%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -26,7 +26,10 @@ BuildRequires: llvm-toolset-7-cmake devtoolset-8-gcc-c++ python-devel python2-py
 %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
@@ -61,7 +64,7 @@ The package contains header files for %{name}.
 
 %prep
 %setup -q -c -T
-OPTS=""
+OPTS="--depth 10000"
 %if !0%{?rhel:1} || 0%{?rhel} > 7
   OPTS="$OPTS --no-tags"
 %endif
@@ -69,11 +72,12 @@ 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 .
+git clone --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 fetch jankratochvil
+#git remote add jankratochvil git://git.jankratochvil.net/lldb
+git remote add jankratochvil https://github.com/jankratochvil/llvm-project.git
+git fetch $OPTS jankratochvil
 git config user.email jankratochvil@copr.fedorainfracloud.org
 git config user.name jankratochvil
 %endif
@@ -169,7 +173,7 @@ 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
 )
 
@@ -183,7 +187,7 @@ rm -fv %{buildroot}%{_libdir}/*.a
 %{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