[geard/f19: 7/7] update to latest HEAD commit 6850c8d in upstream master

[Adam Miller]

commit d6e7c26239abe0b5bad14a10098886f4d2071528
Merge: 3ee07cc e5742e4
Author: Adam Miller <admiller at redhat.com>
Date:   Wed Jul 2 17:07:55 2014 -0500

    update to latest HEAD commit 6850c8d in upstream master

 .gitignore |    3 +++
 geard.spec |   32 +++++++++++++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 33 insertions(+), 4 deletions(-)
---
diff --cc geard.spec
index 185bd4d,623b5d1..9c0ab0e
--- a/geard.spec
+++ b/geard.spec
@@@ -45,6 -51,10 +51,9 @@@ Requires:       docker-i
  
  %prep
  %setup -q -n geard-%{commit}
 -
+ %if 0%{?fedora} >= 21
+ %patch0 -p1 -b selinux-impl
+ %endif
  
  %build
  mkdir _build
@@@ -91,10 -101,28 +100,27 @@@ install -d -p %{buildroot}%{_sharedstat
  %dir %{_sharedstatedir}/containers
  
  %changelog
+ * Wed Jul 02 2014 Adam Miller <maxamillion at fedoraproject.org> - 0-0.13.git6850c8d
+ - New builds from upstream master at commit id 6850c8d
+ 
+ * Wed Jun 11 2014 Adam Miller <maxamillion at fedoraproject.org> - 0-0.12.1.git8b2dcfc
+ - Remove sti binary as per upstream feedback
+ - Conditionally patch for selinux F20 vs F21+
+ 
+ * Wed Jun 11 2014 Adam Miller <maxamillion at fedoraproject.org> - 0-0.12.git8b2dcfc
+ - New builds from upstream master at commit id 8b2dcfc
+ - Add sti binary
+ 
+ * Mon Jun 09 2014 Adam Miller <maxamillion at fedoraproject.org> - 0-0.11.git8b2dcfc
+ - New builds from upstream master at commit id 8b2dcfc
+ 
+ * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.10.git3c781d0
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+ 
  * Thu May 29 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0-0.9.git
  - update to latest master 3c781d0cd8a961a85449d362fb5d8c88c5a34a22
 -- fix selinux build issue with
 -  https://github.com/pmorie/geard/commit/cd1475c12ab622115e27fefc2fd9481e24ae99c0
  - Require docker-io to fix BZ 1097638
 +- selinux fix in master 0-0.9 not required in f20
  
  * Sat May 17 2014 Lokesh Mandvekar <lsm5 at redhat.com> - 0-0.8.git
  - update to latest master