- up to 0.16.0

[packages/sysdig.git] / sysdig.spec

diff --git a/sysdig.spec b/sysdig.spec
index 3ff42108722b5f9fd54ddd3f92f075a51698c417..eff5b5baab0d02f6512ff548c1476ffea740cba3 100644 (file)
--- a/sysdig.spec
+++ b/sysdig.spec
@@ -1,8 +1,3 @@
-# TODO
-# - fix kernel build
-#    Reason: /usr/src/BUILD/sysdig-0.5.1/driver/main.c:51:27: fatal error: driver_config.h: No such file or directory
-# - fix downloading extra deps
-# - fix userspace openssl build
 #
 # NOTES:
 # - https://github.com/draios/sysdig/wiki/How-to-Install-Sysdig-from-the-Source-Code
@@ -23,38 +18,39 @@ exit 1
 # nothing to be placed to debuginfo package
 %define                _enable_debug_packages  0
 %endif
+%ifnarch %{ix86} %{x8664} %{arm} mips ppc
+%undefine      with_luajit
+%endif
 
-%define                rel     0.1
+%define                rel     1
 %define                pname   sysdig
 Summary:       sysdig, a system-level exploration and troubleshooting tool
 Summary(pl.UTF-8):     sysdig - narzędzie do przeglądu i rozwiązywania problemów na poziomie systemowym
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version:       0.5.1
+Version:       0.16.0
 Release:       %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:       GPL v2
 Group:         Applications/System
+#Source0Download: https://github.com/draios/sysdig/releases
 Source0:       https://github.com/draios/sysdig/archive/%{version}/%{pname}-%{version}.tar.gz
-# Source0-md5: deba174d3c15639382fe6ec8e0fe70d5
+# Source0-md5: 8da9d45a417d3d3fbb80c77cb595a281
 Patch0:                buildflags.patch
 URL:           http://www.sysdig.org/
 BuildRequires: rpmbuild(macros) >= 1.701
-%if %{with userspace}
 BuildRequires: cmake >= 2.8.2
 BuildRequires: curl-devel >= 7.45.0
+BuildRequires: jq-devel >= 1.5
 BuildRequires: jsoncpp-devel
-BuildRequires: libb64-devel >= 1.2
+BuildRequires: libb64-devel >= 1.2.1
 BuildRequires: libstdc++-devel >= 6:4.4
-%{!?with_luajit:BuildRequires: lua5.1-devel >= 5.1}
+%{!?with_luajit:BuildRequires: lua51-devel >= 5.1}
 %{?with_luajit:BuildRequires:  luajit-devel >= 2.0.3}
 BuildRequires: ncurses-devel >= 5.9
 BuildRequires: openssl-devel >= 1.0.2
 BuildRequires: zlib-devel >= 1.2.8
 %{!?with_luajit:BuildConflicts:        luajit-devel}
-ExclusiveArch: %{ix86} %{x8664}
-%else
-ExclusiveArch: %{ix86} %{x8664} x32
-%endif
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
+ExclusiveArch: %{ix86} %{x8664} x32
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # constify %{name}
@@ -166,14 +162,7 @@ Ten pakiet zawiera moduł sysdig-probe for jądra Linuksa.\
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
 
-# we need just obj-m from the file
-cp driver/Makefile{.in,}
-%{__sed} -i -e 's/@KBUILD_FLAGS@//' driver/Makefile
-
 %build
-%{?with_kernel:%{expand:%build_kernel_packages}}
-
-%if %{with userspace}
 install -d build
 cd build
 %cmake .. \
@@ -182,13 +171,21 @@ cd build
        -DBUILD_DRIVER=OFF \
        -DUSE_BUNDLED_B64=OFF \
        -DUSE_BUNDLED_CURL=OFF \
+       -DUSE_BUNDLED_JQ=OFF \
        -DUSE_BUNDLED_JSONCPP=OFF \
        -DUSE_BUNDLED_LUAJIT=OFF \
        -DUSE_BUNDLED_NCURSES=OFF \
        -DUSE_BUNDLED_OPENSSL=OFF \
        -DUSE_BUNDLED_ZLIB=OFF
+cd ..
+
+%if %{with kernel}
+cp -f build/driver/Makefile.dkms driver/Makefile
+%{expand:%build_kernel_packages}
+%endif
 
-%{__make}
+%if %{with userspace}
+%{__make} -C build
 %endif
 
 %install