[fedmsg] Move systemd .service files to the correct place.

Ralph Bean ☃ ralph at fedoraproject.org
Mon Mar 25 14:22:38 UTC 2013


commit 93e3f72d533c1f0cdd8e73687c5da21fcd9fd1e3
Author: Ralph Bean <rbean at redhat.com>
Date:   Mon Mar 25 10:22:29 2013 -0400

    Move systemd .service files to the correct place.

 fedmsg.spec |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/fedmsg.spec b/fedmsg.spec
index bd789da..92361f6 100644
--- a/fedmsg.spec
+++ b/fedmsg.spec
@@ -5,7 +5,7 @@
 
 Name:           fedmsg
 Version:        0.6.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools for Fedora Infrastructure real-time messaging
 Group:          Applications/Internet
 License:        LGPLv2+
@@ -162,15 +162,15 @@ PYTHONPATH=$(pwd) python setup.py test
 %else
 %{__mkdir_p} %{buildroot}%{_datadir}/dbus-1/services
 %{__install} initsys/systemd/fedmsg-hub.service \
-    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-hub.service
+    %{buildroot}%{_unitdir}/fedmsg-hub.service
 %{__install} initsys/systemd/fedmsg-relay.service \
-    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-relay.service
+    %{buildroot}%{_unitdir}/fedmsg-relay.service
 %{__install} initsys/systemd/fedmsg-irc.service \
-    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-irc.service
+    %{buildroot}%{_unitdir}/fedmsg-irc.service
 %{__install} initsys/systemd/fedmsg-tweet.service \
-    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-tweet.service
+    %{buildroot}%{_unitdir}/fedmsg-tweet.service
 %{__install} initsys/systemd/fedmsg-gateway.service \
-    %{buildroot}%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-gateway.service
+    %{buildroot}%{_unitdir}/fedmsg-gateway.service
 %endif
 
 # Logrotate configuration
@@ -243,7 +243,7 @@ fi
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-hub
 %else
-%{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-hub.service
+%{_unitdir}/fedmsg-hub.service
 %endif
 
 %files relay
@@ -251,7 +251,7 @@ fi
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-relay
 %else
-%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-relay.service
+%{_unitdir}/fedmsg-relay.service
 %endif
 
 %files irc
@@ -259,7 +259,7 @@ fi
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-irc
 %else
-%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-irc.service
+%{_unitdir}/fedmsg-irc.service
 %endif
 
 %files tweet
@@ -267,7 +267,7 @@ fi
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-tweet
 %else
-%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-tweet.service
+%{_unitdir}/fedmsg-tweet.service
 %endif
 
 %files gateway
@@ -275,10 +275,15 @@ fi
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %{_sysconfdir}/init.d/fedmsg-gateway
 %else
-%config %{_datadir}/dbus-1/services/org.fedoraproject.fedmsg-gateway.service
+%{_unitdir}/fedmsg-gateway.service
 %endif
 
 %changelog
+* Mon Mar 25 2013 Ralph Bean <rbean at redhat.com> - 0.6.8-2
+- Moved .service files from a dbus folder to a systemd folder
+  https://github.com/fedora-infra/fedmsg/issues/125
+- Marked .service files as no longer %%config files.
+
 * Mon Mar 04 2013 Ralph Bean <rbean at redhat.com> - 0.6.8-1
 - New fedmsg-tail --gource option for visualizations.
 - fedmsg-tweet reorganized to be more similar to other daemons.


More information about the scm-commits mailing list