X-Git-Url: http://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=lldb-experimental.spec;h=9d3947b62be0f577b594393ca3d2237e5e1441ec;hp=86e58195a94778478667730d2815dc96a2512571;hb=58b748dddbe924bc34f008189ea4308ba57d07bc;hpb=6e648db7dd33d8155b71e5f20214116149f4f80b

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 86e5819..9d3947b 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -1,7 +1,7 @@
 # https://download.copr.fedorainfracloud.org/results/jankratochvil/lldb/fedora-rawhide-x86_64/01574351-lldb-experimental/builder-live.log.gz
 # No space left on device.
 %global fast 1
-%global use_jankratochvil_dwz 0
+%global use_jankratochvil_dwz 1
 %global use_jankratochvil_rust 0
 %global pkg_prefix /opt/%{name}
 %global _unpackaged_files_terminate_build 0
@@ -14,7 +14,7 @@
 %endif
 Name: lldb-experimental
 Version: 12.0.0
-Release: 0.20201026snap6%{?dist}
+Release: 0.20201028snap0%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -41,9 +41,19 @@ BuildRequires: cmake3
 BuildRequires: cmake
 %else
 # cmake-3.17.0-1.el8:
-###BuildRequires: /usr/bin/sphinx-build curl-devel emacs jsoncpp-devel libarchive-devel openssl-devel pkgconfig(Qt5Widgets) rhash-devel
+BuildRequires: wget expat-devel
+BuildRequires: /usr/bin/sphinx-build curl-devel emacs jsoncpp-devel openssl-devel pkgconfig(Qt5Widgets) rhash-devel
+# -- Could NOT find LibArchive: Found unsuitable version "3.3.2", but required is at least "3.3.3" (found /usr/lib64/libarchive.so)
+# CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found!
+#BuildRequires: libarchive-devel
+# -- Could NOT find LibUV: Found unsuitable version "", but required is at least "1.10.0" (found LibUV_LIBRARY-NOTFOUND)
+# CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!
 # [local]=https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/$basearch/
-###BuildRequires: libuv-devel
+#BuildRequires: libuv-devel
+# CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
+# Please set them or make sure they are set and tested correctly in the CMake files:
+# BZIP2_LIBRARY
+BuildRequires: bzip2-devel
 %endif
 BuildRequires: swig
 BuildRequires: python3-devel python3-pygments python3-pyyaml
@@ -105,19 +115,17 @@ The package contains header files for %{name}.
 . /opt/rh/rh-python38/enable
 %endif
 %if 0%{?rhel} == 8
-cmakesrc=cmake-3.17.0-1.fc32.src.rpm
+cmakesrc=cmake-3.18.3-1.fc33.src.rpm
 rm -rf $cmakesrc $cmakesrc.tgz $cmakesrc.d
-wget http://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/32/Everything/source/tree/Packages/c/$cmakesrc
+wget http://ftp.fi.muni.cz/pub/linux/fedora/linux/releases/33/Everything/source/tree/Packages/c/$cmakesrc
 rpm2archive $cmakesrc
 (mkdir $cmakesrc.d
  cd $cmakesrc.d
  tar xzf ../$cmakesrc.tgz
  # FIXME: Why?
  for i in .[a-z]*;do mv $i `echo $i|sed 's/^\.//'`;done
- # -- Could NOT find LibArchive: Found unsuitable version "3.3.2", but required is at least "3.3.3" (found /usr/lib64/libarchive.so)
- # CMAKE_USE_SYSTEM_LIBARCHIVE is ON but LibArchive is not found!
- sed -i -e 's/qt-gui /&--no-system-libarchive /' cmake.spec
- rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" -bc cmake.spec
+ sed -i -e 's/qt-gui /&--no-system-libarchive --no-system-libuv /' cmake.spec
+ rpmbuild --define "_topdir $PWD" --define "_builddir $PWD" --define "_rpmdir $PWD" --define "_sourcedir $PWD" --define "_specdir $PWD" --define "_srcrpmdir $PWD" -bc --nodeps cmake.spec
 )
 %global __cmake %(echo %{_builddir}/cmake-*.d/cmake-*/*/bin/cmake)
 %global __cmake_builddir .