zsh-completions cleanup

[packages/sysdig.git] / sysdig.spec

diff --git a/sysdig.spec b/sysdig.spec
index 86c74260bd276ac02fd619b1e9d179bdbaf5e638..7aae6d7374f12b7a2429082814252a157d2d8243 100644 (file)
--- a/sysdig.spec
+++ b/sysdig.spec
@@ -19,7 +19,7 @@ exit 1
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     0.3
+%define                rel     2
 %define                pname   sysdig
 Summary:       sysdig, a system-level exploration and troubleshooting tool
 Name:          %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
@@ -29,15 +29,19 @@ License:    GPL v2
 Group:         Applications/System
 Source0:       https://github.com/draios/sysdig/archive/%{version}/%{pname}-%{version}.tar.gz
 # Source0-md5: 5fe96a3a0fd98b2157a40cb29af41afc
+Patch0:                buildflags.patch
 URL:           http://www.sysdig.org/
+BuildRequires: rpmbuild(macros) >= 1.701
+%if %{with userspace}
 BuildRequires: cmake >= 2.8.2
 BuildRequires: jsoncpp-devel
 BuildRequires: libstdc++-devel >= 6:4.4
 BuildRequires: luajit-devel >= 2.0.3
 BuildRequires: ncurses-devel >= 5.9
-BuildRequires: rpmbuild(macros) >= 1.701
 BuildRequires: zlib-devel >= 1.2.8
+%endif
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
+ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # constify %{name}
@@ -69,7 +73,7 @@ This package contains a DKMS-ready driver for sysdig.
 Summary:       bash-completion for sysdig
 Summary(pl.UTF-8):     Bashowe dopełnianie składni dla sysdig
 Group:         Applications/Shells
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{version}-%{rel}
 Requires:      bash-completion
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
@@ -81,7 +85,7 @@ bash-completion for sysdig.
 %package -n zsh-completion-%{name}
 Summary:       zsh-completion for sysdig
 Group:         Applications/Shells
-Requires:      %{name} = %{version}-%{release}
+Requires:      %{name} = %{version}-%{rel}
 %if "%{_rpmversion}" >= "5"
 BuildArch:     noarch
 %endif
@@ -125,6 +129,7 @@ This package contains Linux module.\
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 # we need just obj-m from the file
 cp driver/Makefile{.in,}
@@ -138,7 +143,7 @@ install -d build
 cd build
 %cmake \
        -DDIR_ETC=%{_sysconfdir} \
-       -DSYSDIG_VERSION=%{version}-%{release} \
+       -DSYSDIG_VERSION=%{version}-%{rel} \
        -DBUILD_DRIVER=OFF \
        -DUSE_BUNDLED_JSONCPP=OFF \
        -DUSE_BUNDLED_LUAJIT=OFF \
@@ -153,6 +158,9 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with userspace}
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
+
+# already installed as %{zshdir}/_sysdig
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/zsh/vendor-completions/_sysdig
 %endif
 
 %if %{with kernel}
@@ -164,16 +172,17 @@ cp -a installed/* $RPM_BUILD_ROOT
 rm -rf $RPM_BUILD_ROOT
 
 %post -n dkms-%{name}
-%{_sbindir}/dkms add -m %{name} -v %{version}-%{release} --rpm_safe_upgrade && \
-%{_sbindir}/dkms build -m %{name} -v %{version}-%{release} --rpm_safe_upgrade && \
-%{_sbindir}/dkms install -m %{name} -v %{version}-%{release} --rpm_safe_upgrade || :
+%{_sbindir}/dkms add -m %{name} -v %{version}-%{rel} --rpm_safe_upgrade && \
+%{_sbindir}/dkms build -m %{name} -v %{version}-%{rel} --rpm_safe_upgrade && \
+%{_sbindir}/dkms install -m %{name} -v %{version}-%{rel} --rpm_safe_upgrade || :
 
 %preun -n dkms-%{name}
-%{_sbindir}/dkms remove -m %{name} -v %{version}-%{release} --rpm_safe_upgrade --all || :
+%{_sbindir}/dkms remove -m %{name} -v %{version}-%{rel} --rpm_safe_upgrade --all || :
 
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
+%doc README.md
 %attr(755,root,root) %{_bindir}/csysdig
 %attr(755,root,root) %{_bindir}/sysdig
 %attr(755,root,root) %{_bindir}/sysdig-probe-loader
@@ -188,11 +197,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -n zsh-completion-%{name}
 %defattr(644,root,root,755)
 %{zshdir}/_sysdig
-%{_datadir}/zsh/vendor-completions/_sysdig
 %endif
 
 %if %{with dkms}
 %files -n dkms-%{name}
 %defattr(644,root,root,755)
-%{_usrsrc}/%{name}-%{version}-%{release}
+%{_usrsrc}/%{name}-%{version}-%{rel}
 %endif