manual merge

Change-Id: I75355d4671c46edbb2a6a64a7a8b6217d02d4c12

diff --cc Makefile.am
index 07aff1dc7eb175b5554a9eadd3220cc082afb095,98ff957e6908460402be7ba2f2ccd73668d231bd..e421b8070a00a6eb587d139f9a9d9eba38342570
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -41,7 -50,5 +50,8 @@@ initramfsdir=$(prefix)/etc/initramfs-to
  
  man8_MANS= bcache-super-show.8 \
           make-bcache.8 \
-          probe-bcache.8
+          probe-bcache.8 \
+          bcacheadm.8
 +
 +include ../../../../../../../../../../usr/share/DateraContainer/Makefile.rpm
 +# some version of automake don't like absolute path names for included makefiles

diff --cc bcache-tools.spec
index d3e877c997c71f15d1667d367d1b0439dac6635a,77815c2bf7be588276ddc60a4ff7bc30df81e3e1..5242ee2f1cccaff43c21ded86983fb270a53087a
--- 1/bcache-tools.spec
--- 2/bcache-tools.spec
+++ b/bcache-tools.spec
@@@ -7,11 -7,10 +7,11 @@@ License: GP
  Group: tools
  BuildRoot: %{_tmppath}/%{name}-root
  Requires: libblkid
- BuildRequires: pkgconfig libblkid-devel linux-headers
+ BuildRequires: pkgconfig libblkid-devel linux-headers libnih-devel
 +Summary: tools to manage bcache
  
 -%package dev
  
  %description
 +bcache tools
  
  %files

diff --cc configure.ac
Simple merge