From 8ae082ada5e3959c726fce1be4c82a098213f61a Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenko@redhat.com>
Date: Tue, 12 Jul 2016 09:45:04 +0200
Subject: [PATCH] Trivial fixes in packaging

Signed-off-by: Igor Gnatenko <ignatenko@redhat.com>
---
 bubblewrap.spec | 35 ++++++++++++++++++-----------------
 sources         |  2 +-
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/bubblewrap.spec b/bubblewrap.spec
index d20ba1a..5fa2758 100644
--- a/bubblewrap.spec
+++ b/bubblewrap.spec
@@ -1,17 +1,14 @@
-%global commit0 f64a1917d13d9df8930fa5a767859b4e5328367f
-%global gittag0 v0.1.1
-%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
-
-Summary: Core execution tool for unprivileged containers
 Name: bubblewrap
 Version: 0.1.1
-Release: 1%{?dist}
-#VCS: git:https://github.com/projectatomic/bubblewrap
-Source0: https://github.com/projectatomic/%{name}/archive/%{gittag0}.tar.gz#/%{name}-%{gittag0}.tar.gz
-License: LGPLv2+
-URL: https://github.com/projectatomic/bubblewrap
+Release: 2%{?dist}
+Summary: Core execution tool for unprivileged containers
 
-BuildRequires: git
+License: LGPLv2+
+#VCS: git:https://github.com/projectatomic/bubblewrap
+URL: https://github.com/projectatomic/bubblewrap
+Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
+
+BuildRequires: gcc
 # We always run autogen.sh
 BuildRequires: autoconf automake libtool
 BuildRequires: libcap-devel
@@ -25,29 +22,33 @@ containers that works as a setuid binary on kernels without
 user namespaces.
 
 %prep
-%autosetup -Sgit -n %{name}-%{version}
+%autosetup
 
 %build
 env NOCONFIGURE=1 ./autogen.sh
 %configure --disable-silent-rules --with-priv-mode=none
-
-make %{?_smp_mflags}
+%make_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p -c"
-find $RPM_BUILD_ROOT -name '*.la' -delete
+%make_install INSTALL="install -p -c"
+find %{buildroot} -name '*.la' -delete -print
 
 %files
 %license COPYING
 %doc README.md
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/bwrap
 %if (0%{?rhel} != 0 && 0%{?rhel} <= 7)
 %attr(0755,root,root) %caps(cap_sys_admin,cap_net_admin,cap_sys_chroot=ep) %{_bindir}/bwrap
 %else
 %{_bindir}/bwrap
 %endif
-%{_mandir}/man1/*
+%{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Jul 12 2016 Igor Gnatenko <ignatenko@redhat.com> - 0.1.1-2
+- Trivial fixes in packaging
+
 * Fri Jul 08 2016 Colin Walters <walters@verbum.org> - 0.1.1
 - Initial package
diff --git a/sources b/sources
index 900a8eb..98ed358 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-742e93ebe8c1c63d41560e85b3b5073a  bubblewrap-v0.1.1.tar.gz
+742e93ebe8c1c63d41560e85b3b5073a  bubblewrap-0.1.1.tar.gz