[fedmsg] Latest upstream, 0.6.0.
Ralph Bean
ralph at fedoraproject.org
Thu Nov 15 18:13:34 UTC 2012
commit 276ab2e7331be85199697c86e761a5f3ee0960b3
Author: Ralph Bean <rbean at redhat.com>
Date: Thu Nov 15 13:02:58 2012 -0500
Latest upstream, 0.6.0.
.gitignore | 1 +
fedmsg.spec | 85 ++++++++++++++++++++++++++++++++++++++++++++--------------
sources | 2 +-
3 files changed, 66 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7e21bf3..0a69993 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@
/fedmsg-0.5.4.tar.gz
/fedmsg-0.5.5.tar.gz
/fedmsg-0.5.6.tar.gz
+/fedmsg-0.6.0.tar.gz
diff --git a/fedmsg.spec b/fedmsg.spec
index e59e311..d2da0c4 100644
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -4,8 +4,8 @@
%global modname fedmsg
Name: fedmsg
-Version: 0.5.6
-Release: 2%{?dist}
+Version: 0.6.0
+Release: 1%{?dist}
Summary: Tools for Fedora Infrastructure real-time messaging
Group: Applications/Internet
License: LGPLv2+
@@ -18,7 +18,6 @@ BuildRequires: python-devel
BuildRequires: python-setuptools-devel
BuildRequires: python-moksha-hub >= 1.0.2
BuildRequires: python-bunch
-BuildRequires: orbited
BuildRequires: python-nose
BuildRequires: python-daemon
BuildRequires: python-requests
@@ -27,12 +26,6 @@ BuildRequires: python-m2ext
BuildRequires: python-pygments
BuildRequires: python-fabulous
-%if %{?rhel}%{!?rhel:0} >= 6
-
-%else
-BuildRequires: python-repoze-what-quickstart
-%endif
-
Requires: python-moksha-hub >= 1.0.1
Requires: python-simplejson
Requires: python-zmq
@@ -43,7 +36,7 @@ Requires: python-m2ext
Requires: python-pygments
Requires: python-fabulous
-%if %{?rhel}%{!?rhel:0} <= 6
+%if 0%{?rhel} <= 6
BuildRequires: python-ordereddict
BuildRequires: python-argparse
Requires: python-ordereddict
@@ -54,6 +47,23 @@ Requires: python-argparse
Python API used around Fedora Infrastructure to send and receive messages with
zeromq. Includes some CLI tools.
+%package announce
+Summary: The fedmsg-announce command
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+
+%description announce
+This package contains the fedmsg-announce command for sending announcements.
+
+%package collectd
+Summary: A fedmsg plugin for collectd
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+
+%description collectd
+This package contains the fedmsg-collectd command which produces output
+suitable for consumption by a collectd plugin.
+
%package hub
Summary: The FedMsg Hub
Group: Applications/Internet
@@ -78,6 +88,15 @@ Requires: %{name} = %{version}-%{release}
%description irc
This package contains configuration and init scripts for the FedMsg IRC bot.
+%package tweet
+Summary: The FedMsg Twitter/StatusNet Bot
+Group: Applications/Internet
+Requires: %{name} = %{version}-%{release}
+
+%description tweet
+This package contains configuration and init scripts for the FedMsg
+Twitter/StatusNet bot.
+
%package gateway
Summary: The FedMsg Gateway daemon.
Group: Applications/Internet
@@ -103,7 +122,7 @@ rm fedmsg/tests/test_hub.py
rm fedmsg/tests/test_threads.py
%check
-%if %{?rhel}%{!?rhel:0} >= 6
+%if 0%{?rhel} <= 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
@@ -125,20 +144,14 @@ PYTHONPATH=$(pwd) python setup.py test
%{__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
+# XXX - fedmsg-tweet.ini is a typo. It will be moved to fedmsg-tweet.init in
+# the next version (0.6.1)
+%{__install} init.d/fedmsg-tweet.ini %{buildroot}%{_sysconfdir}/init.d/fedmsg-tweet
%{__install} init.d/fedmsg-gateway.init %{buildroot}%{_sysconfdir}/init.d/fedmsg-gateway
# Logrotate configuration
%{__mkdir_p} %{buildroot}/%{_sysconfdir}/logrotate.d
-cat << EOF
-%{_var}/log/%{modname}/*.log {
- weekly
- missingok
- compress
- delaycompress
- copytruncate
- minsize 100k
-}
-EOF > %{buildroot}/%{_sysconfdir}/logrotate.d/%{modname}
+%{__install} logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{modname}
%pre
@@ -156,6 +169,9 @@ EOF > %{buildroot}/%{_sysconfdir}/logrotate.d/%{modname}
%post irc
/sbin/chkconfig --add fedmsg-irc
+%post tweet
+/sbin/chkconfig --add fedmsg-tweet
+
%post gateway
/sbin/chkconfig --add fedmsg-gateway
@@ -178,6 +194,12 @@ if [ $1 -eq 0 ]; then
/sbin/chkconfig --del fedmsg-irc
fi
+%preun tweet
+if [ $1 -eq 0 ]; then
+ /sbin/service fedmsg-tweet stop >/dev/null 2>&1
+ /sbin/chkconfig --del fedmsg-tweet
+fi
+
%preun gateway
if [ $1 -eq 0 ]; then
/sbin/service fedmsg-gateway stop >/dev/null 2>&1
@@ -200,6 +222,11 @@ fi
%config(noreplace) %{_sysconfdir}/fedmsg.d
%config(noreplace) %{_sysconfdir}/logrotate.d/%{modname}
+%files announce
+%{_bindir}/fedmsg-announce
+
+%files collectd
+%{_bindir}/fedmsg-collectd
%files hub
%{_bindir}/fedmsg-hub
@@ -213,11 +240,27 @@ fi
%{_bindir}/fedmsg-irc
%{_sysconfdir}/init.d/fedmsg-irc
+%files tweet
+%{_bindir}/fedmsg-tweet
+%{_sysconfdir}/init.d/fedmsg-tweet
+
%files gateway
%{_bindir}/fedmsg-gateway
%{_sysconfdir}/init.d/fedmsg-gateway
%changelog
+* Thu Nov 15 2012 Ralph Bean <rbean at redhat.com> - 0.6.0-1
+- New upstream version.
+- New service and subpackage: fedmsg-tweet.
+- New command and subpackage: fedmsg-announce.
+- New command and subpackage: fedmsg-collectd.
+- New routing_policy config and extension of fedmsg.crypto.
+- New functions in fedmsg.text to extract usernames and packages for a msg.
+- Updated docs
+- Pull in logrotate configuration from upstream.
+- Updated rhel conditionals.
+- Remove old temporary BR on orbited
+
* Wed Nov 14 2012 Ralph Bean <rbean at redhat.com> - 0.5.6-2
- Added a logrotate configuration.
diff --git a/sources b/sources
index 7281256..9d7a957 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b25e227530afe8e70484c013eb3677f4 fedmsg-0.5.6.tar.gz
+ea51d39ee7b39525f1057ee62d5b49e5 fedmsg-0.6.0.tar.gz
More information about the scm-commits
mailing list