[fedmsg] Latest upstream.

[Ralph Bean]

commit d35a608c66f7af817def1c119ec9ab7fc61204cf
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Jan 21 12:02:29 2013 -0500

    Latest upstream.

 .gitignore  |    2 +
 fedmsg.spec |   76 +++++++++++++++++++++++++++++++++++++++++------------------
 sources     |    2 +-
 3 files changed, 56 insertions(+), 24 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 25c4bab..7d78c74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@
 /fedmsg-0.6.1.tar.gz
 /fedmsg-0.6.2.tar.gz
 /fedmsg-0.6.3.tar.gz
+/fedmsg-0.6.4.tar.gz
+/fedmsg-0.6.5.tar.gz
diff --git a/fedmsg.spec b/fedmsg.spec
index 3d86994..f49cf66 100644
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -4,8 +4,8 @@
 %global modname fedmsg
 
 Name:           fedmsg
-Version:        0.6.3
-Release:        2%{?dist}
+Version:        0.6.5
+Release:        1%{?dist}
 Summary:        Tools for Fedora Infrastructure real-time messaging
 Group:          Applications/Internet
 License:        LGPLv2+
@@ -150,12 +150,26 @@ PYTHONPATH=$(pwd) python setup.py test
 %{__mkdir_p} %{buildroot}/%{_var}/run/%{modname}
 %{__mkdir_p} %{buildroot}/%{_var}/log/%{modname}
 
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %{__mkdir_p} %{buildroot}%{_sysconfdir}/init.d
-%{__install} init.d/fedmsg-hub.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-hub
-%{__install} init.d/fedmsg-relay.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-relay
-%{__install} init.d/fedmsg-irc.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-irc
-%{__install} init.d/fedmsg-tweet.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-tweet
-%{__install} init.d/fedmsg-gateway.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-gateway
+%{__install} initsys/sysv/fedmsg-hub.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-hub
+%{__install} initsys/sysv/fedmsg-relay.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-relay
+%{__install} initsys/sysv/fedmsg-irc.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-irc
+%{__install} initsys/sysv/fedmsg-tweet.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-tweet
+%{__install} initsys/sysv/fedmsg-gateway.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-gateway
+%else
+%{__mkdir_p} %{buildroot}%{_datadir}/dbus-1/services
+%{__install} initsys/systemd/fedmsg-hub.service \
+    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-hub.service
+%{__install} initsys/systemd/fedmsg-relay.service \
+    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-relay.service
+%{__install} initsys/systemd/fedmsg-irc.service \
+    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-irc.service
+%{__install} initsys/systemd/fedmsg-tweet.service \
+    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-tweet.service
+%{__install} initsys/systemd/fedmsg-gateway.service \
+    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-gateway.service
+%endif
 
 # Logrotate configuration
 %{__mkdir_p} %{buildroot}/%{_sysconfdir}/logrotate.d
@@ -168,22 +182,6 @@ PYTHONPATH=$(pwd) python setup.py test
                      -c 'FedMsg' -g %{modname} %{modname} &>/dev/null || :
 
 
-%post hub
-/sbin/chkconfig --add fedmsg-hub
-
-%post relay
-/sbin/chkconfig --add fedmsg-relay
-
-%post irc
-/sbin/chkconfig --add fedmsg-irc
-
-%post tweet
-/sbin/chkconfig --add fedmsg-tweet
-
-%post gateway
-/sbin/chkconfig --add fedmsg-gateway
-
-
 %preun hub
 if [ $1 -eq 0 ]; then
     /sbin/service fedmsg-hub stop >/dev/null 2>&1
@@ -238,25 +236,57 @@ fi
 
 %files hub
 %{_bindir}/fedmsg-hub
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-hub
+%else
+%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-hub.service
+%endif
 
 %files relay
 %{_bindir}/fedmsg-relay
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-relay
+%else
+%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-relay.service
+%endif
 
 %files irc
 %{_bindir}/fedmsg-irc
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-irc
+%else
+%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-irc.service
+%endif
 
 %files tweet
 %{_bindir}/fedmsg-tweet
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-tweet
+%else
+%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-tweet.service
+%endif
 
 %files gateway
 %{_bindir}/fedmsg-gateway
+%if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-gateway
+%else
+%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-gateway.service
+%endif
 
 %changelog
+* Mon Jan 21 2013 Ralph Bean <rbean at redhat.com> - 0.6.5-1
+- Latest upstream
+- Fix JSON encoding between php and python
+- Stop fedmsg-tweet from falling over.
+- Improved logging.
+- Improved crl cache location; don't keep it in /tmp/
+- Fix a crl permissions issue with fedmsg-tail.
+- Remove duplicate help strings for commands.
+- Added systemd service files.
+- Multiple outbound relay endpoints are now possible.
+- Removed old chkconfig statements.
+
 * Fri Dec 07 2012 Ralph Bean <rbean at redhat.com> - 0.6.3-2
 - Removed a file that shouldn't have been included.
 
diff --git a/sources b/sources
index 350275f..1dcde83 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a1be68c2af427f54aec3801df265e6e  fedmsg-0.6.3.tar.gz
+233aef9b3e5ff7abd25b8d2c377c8378  fedmsg-0.6.5.tar.gz