[fedmsg] Splitting up the config into /etc/fedmsg.d/

[Ralph Bean]

commit 34d65f55545159a3f3d2cd5cca298421c731b8c5
Author: Ralph Bean <rbean at redhat.com>
Date:   Thu Jun 7 15:18:32 2012 -0400

    Splitting up the config into /etc/fedmsg.d/

 fedmsg.spec |   30 +++++++++++++++++-------------
 1 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/fedmsg.spec b/fedmsg.spec
index 23d37bd..ff91a13 100644
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -4,7 +4,7 @@
 %global modname fedmsg
 
 Name:           fedmsg
-Version:        0.1.7
+Version:        0.1.8
 Release:        1%{?dist}
 Summary:        Tools for Fedora Infrastructure real-time messaging
 Group:          Applications/Internet
@@ -17,6 +17,15 @@ BuildArch:      noarch
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools-devel
 BuildRequires:  moksha >= 0.8.1
+BuildRequires:  python-bunch
+BuildRequires:  orbited
+BuildRequires:  python-nose
+
+%if %{?rhel}%{!?rhel:0} >= 6
+
+%else
+BuildRequires: python-repoze-what-quickstart
+%endif
 
 Requires:       moksha >= 0.8.1
 Requires:       python-fabulous
@@ -41,17 +50,8 @@ zeromq.  Includes:
 %{__python} setup.py install -O1 --skip-build \
     --install-data=%{_datadir} --root %{buildroot}
 
-%{__mkdir_p} %{buildroot}%{_sysconfdir}
-%{__cp} fedmsg-config.py %{buildroot}%{_sysconfdir}/fedmsg-config.py
-
-%check
-%if %{?rhel}%{!?rhel:0} >= 6
-# Check section removed until a RHEL6 bug with python-repoze-what-plugins-sql
-# can be fixed.  It causes a fatal error in the test suite.
-# https://bugzilla.redhat.com/show_bug.cgi?id=813925
-%else
-PYTHONPATH=$(pwd) python setup.py test
-%endif
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/fedmsg.d/
+%{__cp} fedmsg.d/* %{buildroot}%{_sysconfdir}/fedmsg.d/.
 
 %files
 %doc doc/ README.rst LICENSE
@@ -65,9 +65,13 @@ PYTHONPATH=$(pwd) python setup.py test
 
 %{python_sitelib}/%{modname}/
 %{python_sitelib}/%{modname}-%{version}-py%{pyver}.egg-info/
-%config(noreplace) %{_sysconfdir}/fedmsg-config.py*
+%config(noreplace) %{_sysconfdir}/fedmsg.d/*
 
 %changelog
+* Thu Jun 07 2012 Ralph Bean <rbean at redhat.com> - 0.1.8-1
+- Split config up into /etc/fedmsg.d/
+- Removed tests.
+
 * Wed Jun 06 2012 Ralph Bean <rbean at redhat.com> - 0.1.7-1
 - Bugfix and tests.
 - Added %%check section.