[os-collect-config: 3/3] Merge branch 'f20'

[slagle]

commit b389614d9a8b059bbd980c6a2d0d6fcf96ad95ac
Merge: b94021d df43540
Author: James Slagle <jslagle at redhat.com>
Date:   Thu Sep 11 11:30:22 2014 -0400

    Merge branch 'f20'
    
    Conflicts:
    	os-collect-config.spec

 ...runtime-dependency-and-replace-with-build.patch |    5 +----
 os-collect-config.spec                             |    9 ++++++++-
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --cc os-collect-config.spec
index cfa5bb0,1d9f1a7..bbfbc35
--- a/os-collect-config.spec
+++ b/os-collect-config.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:			os-collect-config
  Version:		0.1.11
--Release:		6%{?dist}
++Release:		7%{?dist}
  Summary:		Collect and cache metadata running hooks on changes
  
  License:		ASL 2.0
@@@ -70,9 -74,9 +74,12 @@@ install -p -D -m 644 %{SOURCE2} %{build
  %{_unitdir}/os-collect-config.service
  
  %changelog
 -* Thu Sep 11 2014 James Slagle <jslagle at redhat.com> - 0.1.11-6
++* Thu Sep 11 2014 James Slagle <jslagle at redhat.com> - 0.1.11-7
+ - Switch to rdopkg.
+ 
 +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.11-6
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 +
  * Tue Feb 25 2014 Steven Dake <sdake at redhat.com> - 0.1.11-5
  - install a os-collect-config default conf file